Author: sshyrkov Date: Tue Sep 18 14:26:41 2007 New Revision: 18543 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18543&repname= =3Djahia Log: JAHIA-2265: Read-only engines - N-Step Workflow - Roles assignments are mis= sing for new Quick correction actions =
http://www.jahia.net/jira/browse/JAHIA-2265 Resolution: adjusted read-only view to reflect latest changes in N-Step Wor= kflow, related to new "Quick correction" actions Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow= /readonly_changeworkflow.jsp Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/wo= rkflow/readonly_changeworkflow.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/engines/workflow/readonly_changeworkflow.= jsp&rev=3D18543&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/webapp/jsp/jahia/engines/workflow= /readonly_changeworkflow.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow= /readonly_changeworkflow.jsp Tue Sep 18 14:26:41 2007 @@ -40,7 +40,6 @@ workflowMode =3D (Integer) engineMap.get(("defaultMode")); } final Map workflowNames =3D (HashMap) engineMap.get("workflowNames"); - final String workflowName =3D (String) engineMap.get("workflowName"); final Map processes =3D (HashMap) engineMap.get("processes"); final String process =3D (String) engineMap.get("process"); final Map rolesMapping =3D (HashMap) engineMap.get("roleMapping"); @@ -172,22 +171,24 @@ resourceName=3D"org.jahia.engines.workflow.definesRoles.label"/>:&= nbsp;</h5> = <% - final ArrayList roleMembersList =3D (ArrayList) engineMap.get("workflo= wRoles"); + final List roleMembersList =3D (List) engineMap.get("workflowRoles"); + final List unlockMembersList =3D (List) engineMap.get("unlockRoles"); final LockKey lockKey =3D (LockKey) engineMap.get("LockKey"); if (! lockKey.getType().equals(LockKey.WAITING_FOR_APPROVAL_TYPE)) { infos =3D null; } for (int i =3D 0; i < roleNb; i++) { final String role =3D (String) roles.get(i); - final HashSet membersSet =3D (HashSet) roleMembersList.get(i); + final Set membersSet =3D (Set) roleMembersList.get(i); + final Set unlockMembersSet =3D (Set) unlockMembersList.get(i); final String[] textPattern =3D {"Principal", "Provider, 6", "Name,= " + userNameWidth, "Properties, 20"}; final PrincipalViewHelper principalViewHelper =3D new PrincipalVie= wHelper(textPattern); = %> <div class=3D"fill" style=3D"width:100%;"> - <div style=3D"float: left; width:49%; text-align: left"> + <div style=3D"float: left; width: 285px"> <%=3DrolesMapping.get(role)%><br/> - <select class=3D"fontfix" name=3D"authMembers<%=3Di%>" size=3D"5" = multiple=3D"multiple" disabled=3D"disabled"> + <select class=3D"fontfix" name=3D"authMembers<%=3Di%>" size=3D"5" = multiple=3D"multiple" disabled=3D"disabled" style=3D"width: 100%"> <% final Iterator it =3D membersSet.iterator(); while (it.hasNext()) { @@ -198,34 +199,35 @@ } if (membersSet.size() =3D=3D 0) { %> - <option value=3D"null">-----<jahia:engineResourceBundle - resourceName=3D"org.jahia.engines.users.SelectUG_Engin= e.noMembers.label"/> - ------</option> + <option value=3D"null">----- <jahia:engineResourceBundle + resourceName=3D"org.jahia.engines.users.SelectUG_Engin= e.noMembers.label"/> -----</option> <% } %> </select> </div> - <% if (infos !=3D null && role.equals(infos.getNextRole())) { %> - <div style=3D"float:right;text-align: left; display:block; width: 40%"> - <br/> <br/> - <table cellpadding=3D"0" cellspacing=3D"5"> - <tr> - <td height=3D"24" width=3D"24"><img border=3D"0" - src=3D"<jahia:serverHttpPa= th/>/jsp/jahia/engines/images/greenArrowLeft.gif" - alt=3D"nextStep"/></td> - <td valign=3D"middle"><jahia:engineResourceBundle - resourceName=3D"org.jahia.engines.workflow.nextSte= p.label"/></td> - </tr> - </table> - </div> - <% } else if (infos !=3D null && role.equals(infos.getCurrentRole())) = { %> - <br/> <br/> - <div style=3D"float:right;text-align: left; display:block; width: 40%"> - <jahia:engineResourceBundle - resourceName=3D"org.jahia.engines.lock.waitingForApprovalC= urrentState.label"/> +<% if (i > 0) { %> + <div style=3D"float: left; padding-left: 20px; width: 285px;"> + <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.work= flow.unlock.groups"/> + <select class=3D"fontfix" name=3D"authMembers<%=3Di%>unlock" size= =3D"5" multiple=3D"multiple" style=3D"width: 100%" disabled=3D"disabled"> + <% + final Iterator iter =3D unlockMembersSet.iterator(); + while (iter.hasNext()) { + final Principal p =3D (Principal) iter.next(); + %> + <option value=3D"<%=3DprincipalViewHelper.getPrincipalValueOpt= ion(p)%>"><%=3DprincipalViewHelper.getPrincipalTextOption(p)%></option> + <% + } + if (unlockMembersSet.size() =3D=3D 0) { + %> + <option value=3D"null">----- <jahia:engineResourceBundle + resourceName=3D"org.jahia.engines.users.SelectUG_Engin= e.noMembers.label"/> -----</option> + <% + } + %> + </select> </div> - <% } %> +<% } %> <div style=3D"clear:both;"> </div> </div> <% @@ -269,20 +271,22 @@ = <% final String nextRole =3D infos.getNextRole(); - final ArrayList roleMembersList =3D (ArrayList) engineMap.get("workflo= wRoles"); + final List roleMembersList =3D (List) engineMap.get("workflowRoles"); + final List unlockMembersList =3D (List) engineMap.get("unlockRoles"); for (int i =3D 0; i < roleNb; i++) { final String role =3D (String) roles.get(i); if (! role.equals(nextRole)) continue; - final HashSet membersSet =3D (HashSet) roleMembersList.get(i); + final Set membersSet =3D (Set) roleMembersList.get(i); + final Set unlockMembersSet =3D (Set) unlockMembersList.get(i); final String[] textPattern =3D {"Principal", "Provider, 6", "Name,= " + userNameWidth, "Properties, 20"}; final PrincipalViewHelper principalViewHelper =3D new PrincipalVie= wHelper(textPattern); = %> <div class=3D"fill" style=3D"width:100%;"> - <div style=3D"float: left; width:49%; text-align: left"> + <div style=3D"float: left; width: 285px"> <%=3DrolesMapping.get(role)%> <% if (infos.isLastStep()) { %> <br/= >(<jahia:engineResourceBundle resourceName=3D"org.jahia.engines.workflow.WorkflowEngine.exte= rnal.laststep.label"/>) <% } %> <br/> - <select class=3D"fontfix" name=3D"authMembers<%=3Di%>" size=3D"5" = multiple=3D"multiple" disabled=3D"disabled"> + <select class=3D"fontfix" name=3D"authMembers<%=3Di%>" size=3D"5" = multiple=3D"multiple" disabled=3D"disabled" style=3D"width: 100%"> <% final Iterator it =3D membersSet.iterator(); while (it.hasNext()) { @@ -293,15 +297,35 @@ } if (membersSet.size() =3D=3D 0) { %> - <option value=3D"null">-----<jahia:engineResourceBundle - resourceName=3D"org.jahia.engines.users.SelectUG_Engin= e.noMembers.label"/> - ------</option> + <option value=3D"null">----- <jahia:engineResourceBundle + resourceName=3D"org.jahia.engines.users.SelectUG_Engin= e.noMembers.label"/> -----</option> <% } %> </select> </div> - +<% if (i > 0) { %> + <div style=3D"float: left; padding-left: 20px; width: 285px;"> + <jahia:engineResourceBundle resourceName=3D"org.jahia.engines.work= flow.unlock.groups"/> + <select class=3D"fontfix" name=3D"authMembers<%=3Di%>unlock" size= =3D"5" multiple=3D"multiple" style=3D"width: 100%" disabled=3D"disabled"> + <% + final Iterator iter =3D unlockMembersSet.iterator(); + while (iter.hasNext()) { + final Principal p =3D (Principal) iter.next(); + %> + <option value=3D"<%=3DprincipalViewHelper.getPrincipalValueOpt= ion(p)%>"><%=3DprincipalViewHelper.getPrincipalTextOption(p)%></option> + <% + } + if (unlockMembersSet.size() =3D=3D 0) { + %> + <option value=3D"null">----- <jahia:engineResourceBundle + resourceName=3D"org.jahia.engines.users.SelectUG_Engin= e.noMembers.label"/> -----</option> + <% + } + %> + </select> + </div> +<% } %> <div style=3D"clear:both;"> </div> </div> <br/> _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
