Author: xlawrence
Date: Wed Jul 18 16:30:38 2007
New Revision: 18031
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18031&repname=
=3Djahia
Log:
Fix bug on notifyall job for administrators. The admins could not put an ob=
ject having a N-Step workflow attached to it to the first yellow state.
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
NotifyAllJob.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/wor=
kflow/NotifyAllJob.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/workflow/NotifyAllJob.java&rev=3D1=
8031&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/services/workflow/=
NotifyAllJob.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
NotifyAllJob.java Wed Jul 18 16:30:38 2007
@@ -105,15 +105,15 @@
// #endif
final WorkflowHelper workflowHelper =3D AdvancedWorkflowEn=
gine.getWorkflowHelper(jParams, theObject);
final WorkflowHelperEntry entry =3D workflowHelper.getEntr=
y(objectKey);
- String actionName =3D null;
+ String actionName =3D AdvancedWorkflowEngine.NOTIFY_COMPLE=
TED_PAGES;
if (entry.getMode() =3D=3D WorkflowService.EXTERNAL) {
- if (! jParams.getUser().isAdminMember(jParams.getSiteI=
D())) {
- final ExternalWorkflow external =3D entry.getExter=
nalWorkflow();
- if (external.getClass() =3D=3D NStepWorkflow.class=
) {
- final NStepWorkflow nstep =3D (NStepWorkflow) =
external;
- final String processID =3D service.getInherite=
dExternalWorkflowProcessId(theObject);
- final ExternalWorkflowInstanceCurrentInfos inf=
os =3D nstep.getCurrentInfo(processID, key,
- jParams.getLocale().toString());
+ final ExternalWorkflow external =3D entry.getExternalW=
orkflow();
+ if (external.getClass() =3D=3D NStepWorkflow.class) {
+ final NStepWorkflow nstep =3D (NStepWorkflow) exte=
rnal;
+ final String processID =3D service.getInheritedExt=
ernalWorkflowProcessId(theObject);
+ final ExternalWorkflowInstanceCurrentInfos infos =
=3D nstep.getCurrentInfo(processID, key,
+ jParams.getLocale().toString());
+ if (! jParams.getUser().isAdminMember(jParams.getS=
iteID())) {
if (infos.isLastStep() || ! nstep.isUserAuthor=
izedForNextStep(processID, key,
jParams.getUser(), languageCodes)) {
if (logger.isDebugEnabled()) {
@@ -127,17 +127,12 @@
lockRegistry.release(lockKey, jParams.=
getUser(), jParams.getUser().getUserKey());
}
continue;
-
- } else {
- actionName =3D new StringBuffer().append(p=
rocessID).append(".").append(infos.getNextRole()).toString();
}
}
+ actionName =3D new StringBuffer().append(processID=
).append(".").append(infos.getNextRole()).toString();
}
- } else {
- actionName =3D AdvancedWorkflowEngine.NOTIFY_COMPLETED=
_PAGES;
}
=
-
final StateModificationContext stateModifContext =3D new S=
tateModificationContext(objectKey, languageCodes);
stateModifContext.addModifiedObjects(allKeys);
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
