Author: sshyrkov
Date: Fri Sep 14 13:54:21 2007
New Revision: 18500
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18500&repname=
=3Djahia
Log:
Do not return "Approve Pending Pages" and "Notify Completed Pages" as possi=
ble actions for object in active state
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/workflow/A=
dvancedWorkflowEngine.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/work=
flow/AdvancedWorkflowEngine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.jav=
a&rev=3D18500&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/workflow/A=
dvancedWorkflowEngine.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/workflow/A=
dvancedWorkflowEngine.java Fri Sep 14 13:54:21 2007
@@ -434,7 +434,7 @@
JahiaResourceBundle.getEngineResource(=
"org.jahia.engines.workflow.WorkflowEngine.JahiaWorkflow.label", jParams, j=
Params.getLocale()),
REFUSE));
}
- } else {
+ } else if (!isActiveState) {
if (object.checkAdminAccess(jParams.getUser(), tru=
e)) {
availableOptions.add(new ActionEntry(APPROVE_P=
ENDING_PAGES,
JahiaResourceBundle.getEngineResource(=
"org.jahia.engines.workflow.WorkflowEngine.ApprovePendingPages.label", jPar=
ams, jParams.getLocale()),
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
