Author: sshyrkov
Date: Fri Sep 14 14:00:36 2007
New Revision: 18502
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18502&repname=
=3Djahia
Log:
Do not return "Approve Pending Pages" and "Notify Completed Pages" as possi=
ble actions for object in active state
Modified:
trunk/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.j=
ava
Modified: trunk/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEn=
gine.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/engines/workflow/AdvancedWorkflowEngine.java&rev=3D18502&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
--- trunk/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.j=
ava (original)
+++ trunk/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.j=
ava Fri Sep 14 14:00:36 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()),
@@ -480,7 +480,7 @@
while (iterator.hasNext()) {
final String option =3D (String) iterator.next=
();
String key =3D entry.getWorkflowName() + "." +=
entry.getProcessId() + "." + option;
- availableOptions.add(new ActionEntry(key, work=
flow.getActionName(processId, option), processId, workflow.getProcessName(p=
rocessId),key));
+ availableOptions.add(new ActionEntry(key, work=
flow.getActionName(processId, option), processId, workflow.getProcessName(p=
rocessId), key));
}
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
