Author: xlawrence
Date: Thu Jul 19 16:03:55 2007
New Revision: 18042
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18042&repname=
=3Djahia
Log:
do not allow publication for NStep workflows for admins when clicking on no=
tify
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=
8042&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 Thu Jul 19 16:03:55 2007
@@ -113,11 +113,16 @@
final String processID =3D service.getInheritedExt=
ernalWorkflowProcessId(theObject);
final ExternalWorkflowInstanceCurrentInfos infos =
=3D nstep.getCurrentInfo(processID, key,
jParams.getLocale().toString());
+ if (infos.isLastStep()) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Ignoring action since we are=
on last step");
+ continue;
+ }
+ }
if (! jParams.getUser().isAdminMember(jParams.getS=
iteID())) {
- if (infos.isLastStep() || ! nstep.isUserAuthor=
izedForNextStep(processID, key,
+ if (! nstep.isUserAuthorizedForNextStep(proces=
sID, key,
jParams.getUser(), languageCodes)) {
if (logger.isDebugEnabled()) {
- logger.debug("NSTEP isLastStep: " + in=
fos.isLastStep());
logger.debug("user is not authorized f=
or the following step on");
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
