Author: sshyrkov Date: Mon Oct 1 16:30:41 2007 New Revision: 18714 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18714&repname= =3Djahia Log: JAHIA-2413: SP3: Nstep for site administrators: only std workflow is possib= le - nstep icon is not clickable - siteadmin can not unblock a step on a ns= tep workflow =
http://www.jahia.net/jira/browse/JAHIA-2413 Resolution: members of the 'administrators' group have now access to all ac= tions (including 'Quick correction') of the N-Step workiflow, even if not e= xcplicitly assigned in the workflow configuration Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/workflow/nstep/NSt= epWorkflow.java Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/workflow/nst= ep/NStepWorkflow.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/workflow/nstep/NStepWorkflow.java&rev=3D187= 14&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/workflow/nstep/NSt= epWorkflow.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/workflow/nstep/NSt= epWorkflow.java Mon Oct 1 16:30:41 2007 @@ -417,7 +417,10 @@ JahiaGroup group =3D workflowService.getRoleGroup(contentO= bjectInstance, trimActionName(workflowStep.getName()), true); JahiaUser user =3D jParams.getUser(); - if ((group.isMember(user) && (!lastStep || contentObjectIn= stance.checkAdminAccess(user))) || user.isRoot()) + boolean belongsToAdmins =3D user.isAdminMember(jParams.get= SiteID()); + if ((group.isMember(user) && (!lastStep || contentObjectIn= stance + .checkAdminAccess(user))) + || user.isRoot() || belongsToAdmins) { list.add(trimActionName(workflowStep.getName())); // avoid rollback on first two step @@ -436,11 +439,9 @@ // checks: // not the first step // and user belongs to the allowed group - // or it is a root or admin (and the lock/unlcok actions w= ere enabled on this step for at least one group) + // or it is a root or admin if (startIndex > 1 - && (group.isMember(user) || (contentObjectInstance - .checkAdminAccess(user) || user.isRoot()) - && group.members().hasMoreElements())) { + && (group.isMember(user) || user.isRoot() || belon= gsToAdmins)) { // Add actions for making content editable if (languageState =3D=3D EntryLoadRequest.WAITING_WORK= FLOW_STATE) { list.add(trimActionName(UNLOCK_ACTION_NAME)); _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
