Author: sshyrkov Date: Tue Oct 2 14:48:09 2007 New Revision: 18726 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18726&repname= =3Djahia Log: MIN-365: Onglet outil item workflow http://www.jahia.net/jira/browse/MIN-365 JAHIA-2346: N-Step - Workflow type definition - switching the language in t= he engine - role assignments are lost =
http://www.jahia.net/jira/browse/JAHIA-2346 JAHIA-2425: SP3: Nstep: Read-only engine - current step CSS issues http://www.jahia.net/jira/browse/JAHIA-2425 Resolution: 1) do not loose role assignments on actions (tab switching, other links) 2) consider currently selected language 3) CSS issues for read-only engine Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/workflow/M= anageWorkflow.java 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/java/org/jahia/engines/work= flow/ManageWorkflow.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/engines/workflow/ManageWorkflow.java&rev=3D= 18726&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/engines/workflow/M= anageWorkflow.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/workflow/M= anageWorkflow.java Tue Oct 2 14:48:09 2007 @@ -19,6 +19,7 @@ = import org.jahia.content.ContentObject; import org.jahia.content.ContentObjectKey; +import org.jahia.engines.EngineLanguageHelper; import org.jahia.engines.JahiaEngine; import org.jahia.engines.users.SelectUG_Engine; import org.jahia.exceptions.JahiaException; @@ -123,9 +124,14 @@ return false; } = - int workflowMode; + final EngineLanguageHelper elh =3D (EngineLanguageHelper) engineMap + .get(JahiaEngine.ENGINE_LANGUAGE_HELPER); + final Locale locale =3D elh !=3D null && elh.getCurrentLocale() != =3D null ? elh + .getCurrentLocale() : jParams.getCurrentLocale(); = - Map workflowNames =3D service.getExternalWorkflowNames(jParams.get= Locale()); + int workflowMode; + = + Map workflowNames =3D service.getExternalWorkflowNames(locale); = engineMap.put("workflowNames", workflowNames); = @@ -168,7 +174,7 @@ final Map processesWithNames =3D new LinkedHashMap(); for (final Iterator iterator =3D availableProcesses.iterat= or(); iterator.hasNext();) { final String s =3D (String) iterator.next(); - processesWithNames.put(s, workflow.getProcessName(s, j= Params.getLocale())); + processesWithNames.put(s, workflow.getProcessName(s, l= ocale)); } engineMap.put("processes", processesWithNames); = @@ -198,36 +204,37 @@ final List roleMembersList =3D new ArrayList(); for (int i =3D 0; i < roles.size(); i++) { final String role =3D (String) roles.get(i); - JahiaGroup grp =3D null; - if (object !=3D null) { - grp =3D service.getRoleGroup(object, role, false); - } - if (grp !=3D null) { - Set appMembers =3D (Set) engineMap.get("authMember= s" + i); - if (appMembers =3D=3D null) - appMembers =3D getAppMembers(grp); - roleMembersList.add(appMembers); - } else { - roleMembersList.add(Collections.EMPTY_SET); + Set appMembers =3D (Set) engineMap.get("authMembers" += i); + if (appMembers =3D=3D null) { + if (object !=3D null) { + JahiaGroup grp =3D service.getRoleGroup(object= , role, + false); + if (grp !=3D null) { + appMembers =3D getAppMembers(grp); + } + } } - rolesWithNames.put(role, workflow.getActionName(proces= s, role, jParams.getLocale())); + roleMembersList.add(appMembers !=3D null ? appMembers + : Collections.EMPTY_SET); + rolesWithNames.put(role, workflow.getActionName(proces= s, role, locale)); } = List unlockMembersList =3D new ArrayList(); for (int i =3D 0; i < roles.size(); i++) { final String role =3D (String) roles.get(i) + "_unlock= "; - JahiaGroup grp =3D null; - if (object !=3D null) { - grp =3D service.getRoleGroup(object, role, false); - } - if (grp !=3D null) { - Set appMembers =3D (Set) engineMap.get("authMember= s" + i + "unlock"); - if (appMembers =3D=3D null) - appMembers =3D getAppMembers(grp); - unlockMembersList.add(appMembers); - } else { - unlockMembersList.add(Collections.EMPTY_SET); + Set appMembers =3D (Set) engineMap.get("authMembers" += i + + "unlock"); + if (appMembers =3D=3D null) { + if (object !=3D null) { + JahiaGroup grp =3D service.getRoleGroup(object= , role, + false); + if (grp !=3D null) { + appMembers =3D getAppMembers(grp); + } + } } + unlockMembersList.add(appMembers !=3D null ? appMembers + : Collections.EMPTY_SET); } = if (object !=3D null) { @@ -242,7 +249,7 @@ = if (objectHavingTheWorkflow !=3D null) { engineMap.put("infos", workflow.getCurrentInfo(pro= cess, - objectHavingTheWorkflow.getObjectKey().toS= tring(), jParams.getLocale().toString())); + objectHavingTheWorkflow.getObjectKey().toS= tring(), locale.getLanguage())); } } engineMap.put("roleMapping", rolesWithNames); 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=3D18726&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 Oct 2 14:48:09 2007 @@ -186,12 +186,12 @@ = %> <div class=3D"fill" style=3D"width:100%;"> - <div style=3D"float: left; width: 275px"> + <div style=3D"float: left; width: 275px; position: relative;"> <% if (role.equals(infos.getNextRole())) { %> <img src=3D"<jahia:serverHttpPath/>/jsp/jahia/engines/images/gree= nArrowRight.gif" = alt=3D'<jahia:engineResourceBundle resourceName=3D"org.jahia.= engines.workflow.nextStep.label"/>' = title=3D'<jahia:engineResourceBundle resourceName=3D"org.jahi= a.engines.workflow.nextStep.label"/>' border=3D"0" - style=3D"float: left; margin-left: -25px; margin-top: 40px;"/> + style=3D"position: absolute; left: -25px; top: 35px;"/> <strong><%=3DrolesMapping.get(role)%></strong> <% } else { %> <%=3DrolesMapping.get(role)%> _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
