You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2004/01/23 09:43:31 UTC
cvs commit: cocoon-lenya/src/webapp/lenya/pubs/default/config/tasks tasks.xconf
andreas 2004/01/23 00:43:31
Modified: src/webapp/lenya/content/info deactivate.xsp
src/webapp/lenya/pubs/default/config/workflow workflow.xml
src/webapp/lenya/content/publishing screen.xsp
src/webapp/lenya/pubs/default/config/tasks tasks.xconf
Log:
fixed publish & deactivate
Revision Changes Path
1.14 +13 -6 cocoon-lenya/src/webapp/lenya/content/info/deactivate.xsp
Index: deactivate.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/info/deactivate.xsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- deactivate.xsp 31 Oct 2003 15:28:19 -0000 1.13
+++ deactivate.xsp 23 Jan 2004 08:43:31 -0000 1.14
@@ -22,18 +22,25 @@
<request-uri><xsp-request:get-uri/></request-uri>
<document-id><input:get-attribute module="page-envelope" as="string" name="document-id"/></document-id>
+ <document-language><input:get-attribute module="page-envelope" name="document-language" as="string"/></document-language>
+
+ <workflow-event><input:get-attribute module="request-param" name="lenya.event" as="string"/></workflow-event>
+ <user-id><input:get-attribute module="access-control" name="user-id" as="string"/></user-id>
+ <ip-address><input:get-attribute module="access-control" name="ip-address" as="string"/></ip-address>
+ <role-ids><input:get-attribute module="access-control" name="role-ids" as="string"/></role-ids>
+
<task-id>deactivateDocument</task-id>
<xsp:logic>
try {
Document document = (Document) <input:get-attribute module="page-envelope" as="object" name="document"/>;
SiteTreeNode liveNode = (SiteTreeNode) <input:get-attribute module="sitetree" as="object" name="live-node"/>;
- SiteTreeNode[] liveChildren = liveNode.getChildren();
<language><xsp:expr>document.getLanguage()</xsp:expr></language>
Publication publication = (Publication) <input:get-attribute module="page-envelope" as="object" name="publication"/>;
Label[] labels = liveNode.getLabels();
- if (labels.length < 2) {
+ if (labels.length == 1) {
+ SiteTreeNode[] liveChildren = liveNode.getChildren();
if (liveChildren.length > 0) {
<message id="children-live"/>
}
@@ -41,7 +48,7 @@
DefaultDocumentBuilder builder = DefaultDocumentBuilder.getInstance();
for (int i = 0; i < liveChildren.length; i++) {
Label[] languages = liveChildren[i].getLabels();
- for (int j = 0; j < languages.length; j++){
+ for (int j = 0; j < languages.length; j++) {
String language = languages[j].getLanguage();
String url = builder.buildCanonicalUrl(publication,
document.getArea(), document.getId() + "/" + liveChildren[i].getId(), language);
@@ -54,9 +61,9 @@
}
}
}
- DocumentReferencesHelper helper = new DocumentReferencesHelper(objectModel);
- Document[] references = helper.getReferences(Publication.LIVE_AREA);
- if (references.length > 0) {
+ DocumentReferencesHelper helper = new DocumentReferencesHelper(objectModel);
+ Document[] references = helper.getReferences(Publication.LIVE_AREA);
+ if (references.length > 0) {
</xsp:logic><inconsistent-documents><xsp:logic>
for (int i = 0; i < references.length; i++) {
1.8 +0 -5 cocoon-lenya/src/webapp/lenya/pubs/default/config/workflow/workflow.xml
Index: workflow.xml
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/workflow/workflow.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- workflow.xml 14 Jan 2004 00:12:00 -0000 1.7
+++ workflow.xml 23 Jan 2004 08:43:31 -0000 1.8
@@ -30,7 +30,6 @@
<event id="publish"/>
<condition class="org.apache.lenya.cms.workflow.RoleCondition">reviewer</condition>
<assign variable="is_live" value="true"/>
- <action id="publish"/>
</transition>
<transition source="review" destination="authoring">
@@ -41,13 +40,11 @@
<transition source="live" destination="authoring">
<event id="edit"/>
<condition class="org.apache.lenya.cms.workflow.RoleCondition">editor</condition>
- <action id="save"/>
</transition>
<transition source="authoring" destination="authoring">
<event id="edit"/>
<condition class="org.apache.lenya.cms.workflow.RoleCondition">editor</condition>
- <action id="save"/>
</transition>
<transition source="live" destination="authoring">
@@ -60,13 +57,11 @@
<event id="delete"/>
<condition class="org.apache.lenya.cms.workflow.RoleCondition">editor</condition>
<assign variable="is_live" value="false"/>
- <action id="delete"/>
</transition>
<transition source="authoring" destination="archive">
<event id="archive"/>
<condition class="org.apache.lenya.cms.workflow.RoleCondition">editor</condition>
<assign variable="is_live" value="false"/>
- <action id="archive"/>
</transition>
</workflow>
1.16 +4 -0 cocoon-lenya/src/webapp/lenya/content/publishing/screen.xsp
Index: screen.xsp
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/content/publishing/screen.xsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- screen.xsp 13 Nov 2003 16:22:17 -0000 1.15
+++ screen.xsp 23 Jan 2004 08:43:31 -0000 1.16
@@ -34,6 +34,10 @@
<usecase:area><input:get-attribute module="page-envelope" name="area" as="string"/></usecase:area>
<usecase:language><input:get-attribute module="page-envelope" name="document-language" as="string"/></usecase:language>
<usecase:referer><input:get-attribute module="request" name="requestURI" as="string"/></usecase:referer>
+ <usecase:user-id><input:get-attribute module="access-control" name="user-id" as="string"/></usecase:user-id>
+ <usecase:ip-address><input:get-attribute module="access-control" name="ip-address" as="string"/></usecase:ip-address>
+ <usecase:role-ids><input:get-attribute module="access-control" name="role-ids" as="string"/></usecase:role-ids>
+ <usecase:workflow-event><input:get-attribute module="request-param" name="lenya.event" as="string"/></usecase:workflow-event>
<usecase:task-id>publish</usecase:task-id>
1.10 +6 -7 cocoon-lenya/src/webapp/lenya/pubs/default/config/tasks/tasks.xconf
Index: tasks.xconf
===================================================================
RCS file: /home/cvs/cocoon-lenya/src/webapp/lenya/pubs/default/config/tasks/tasks.xconf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tasks.xconf 9 Nov 2003 05:03:01 -0000 1.9
+++ tasks.xconf 23 Jan 2004 08:43:31 -0000 1.10
@@ -8,11 +8,15 @@
<parameter name="properties.text" value="The test was successful."/>
</task>
- <task id="publish" class="org.apache.lenya.cms.task.AntTask">
+ <task id="publish" class="org.apache.lenya.defaultpub.cms.task.Publish">
<label>Publish</label>
- <parameter name="target" value="publish"/>
</task>
+ <task id="deactivateDocument" class="org.apache.lenya.defaultpub.cms.task.Deactivate">
+ <label>Deactivate</label>
+ </task>
+
+
<task id="create" class="org.apache.lenya.cms.task.AntTask">
<label>Create</label>
<parameter name="target" value="create"/>
@@ -51,11 +55,6 @@
<task id="renameDocument" class="org.apache.lenya.cms.task.AntTask">
<label>RenameDocument</label>
<parameter name="target" value="renameDocument"/>
- </task>
-
- <task id="deactivateDocument" class="org.apache.lenya.cms.task.AntTask">
- <label>Deactivate</label>
- <parameter name="target" value="deactivateDocument"/>
</task>
<task id="movenode" class="org.apache.lenya.cms.task.AntTask">
---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org