You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by rf...@apache.org on 2007/10/24 16:36:44 UTC
svn commit: r587898 - in /lenya/trunk/src:
modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Delete.java
pubs/default/config/workflow/workflow.xml
Author: rfrovarp
Date: Wed Oct 24 07:36:34 2007
New Revision: 587898
URL: http://svn.apache.org/viewvc?rev=587898&view=rev
Log:
Allow for deleting of files directly from archive. Fixes bug 43691.
Modified:
lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Delete.java
lenya/trunk/src/pubs/default/config/workflow/workflow.xml
Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Delete.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Delete.java?rev=587898&r1=587897&r2=587898&view=diff
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Delete.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/site/usecases/Delete.java Wed Oct 24 07:36:34 2007
@@ -31,7 +31,7 @@
* @see org.apache.lenya.cms.site.usecases.MoveSubsite#getSourceAreas()
*/
protected String[] getSourceAreas() {
- return new String[] { Publication.AUTHORING_AREA };
+ return new String[] { Publication.AUTHORING_AREA, Publication.ARCHIVE_AREA };
}
/**
@@ -48,4 +48,4 @@
return "delete";
}
-}
\ No newline at end of file
+}
Modified: lenya/trunk/src/pubs/default/config/workflow/workflow.xml
URL: http://svn.apache.org/viewvc/lenya/trunk/src/pubs/default/config/workflow/workflow.xml?rev=587898&r1=587897&r2=587898&view=diff
==============================================================================
--- lenya/trunk/src/pubs/default/config/workflow/workflow.xml (original)
+++ lenya/trunk/src/pubs/default/config/workflow/workflow.xml Wed Oct 24 07:36:34 2007
@@ -90,6 +90,11 @@
<event id="restore"/>
<condition class="org.apache.lenya.cms.workflow.RoleCondition">edit</condition>
</transition>
+
+ <transition source="archive" destination="trash">
+ <event id="delete"/>
+ <condition class="org.apache.lenya.cms.workflow.RoleCondition">edit</condition>
+ </transition>
<transition source="trash" destination="authoring">
<event id="restore"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org