Author: sshyrkov Date: Tue Oct 2 10:21:03 2007 New Revision: 18721 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18721&repname= =3Djahia Log: JAHIA-2408: SP3 Nstep workflow: I validate my distinct langs one by one and= once both lang are "green" if you reopen your nstep workflow engine, it in= dicates now "No Workflow" =
http://www.jahia.net/jira/browse/JAHIA-2408 Resolution: = 1) if no actions are available --> display "Workflow - No Actions" as a tab= name 2) if any of the non-standard Jahia workflow actions are available, display= the corresponding workflow tab as active Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p= roperties branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d= e.properties branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e= n.properties branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f= r.properties branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/workflow/A= dvancedWorkflowEngine.java branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow= /adv_workflow.jsp Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou= rces.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D18721&rep= name=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/conf/java/JahiaEnginesResources.p= roperties (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p= roperties Tue Oct 2 10:21:03 2007 @@ -1361,6 +1361,7 @@ = org.jahia.engines.workflow.WorkflowEngine.linkedto.label =3D Publication i= s linked to org.jahia.engines.workflow.WorkflowEngine.inheritfrom.label =3D Process in= herited from +org.jahia.engines.workflow.WorkflowEngine.noActions.label =3D Workflow - N= o Actions org.jahia.engines.workflow.WorkflowEngine.noworkflow.label =3D No Workflow org.jahia.engines.workflow.WorkflowEngine.standard.label =3D Jahia standar= d workflow org.jahia.engines.workflow.WorkflowEngine.external.label =3D Other workflo= w(s) Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou= rces_de.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/conf/java/JahiaEnginesResources_de.properties&rev=3D18721&= 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/conf/java/JahiaEnginesResources_d= e.properties (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_d= e.properties Tue Oct 2 10:21:03 2007 @@ -1363,6 +1363,7 @@ = org.jahia.engines.workflow.WorkflowEngine.linkedto.label =3D Die Ver\u00F6= ffentlichung ist verkn\u00FCpft mit org.jahia.engines.workflow.WorkflowEngine.inheritfrom.label =3D Prozess ve= rerbt von +org.jahia.engines.workflow.WorkflowEngine.noActions.label =3D Workflow - K= eine Aktionen org.jahia.engines.workflow.WorkflowEngine.noworkflow.label =3D Kein Workfl= ow org.jahia.engines.workflow.WorkflowEngine.standard.label =3D Jahia-Standar= d-Workflow org.jahia.engines.workflow.WorkflowEngine.external.label =3D Andere(r) Wor= kflow(s) Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou= rces_en.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D18721&= 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/conf/java/JahiaEnginesResources_e= n.properties (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e= n.properties Tue Oct 2 10:21:03 2007 @@ -1360,6 +1360,7 @@ = org.jahia.engines.workflow.WorkflowEngine.linkedto.label =3D Publication i= s linked to org.jahia.engines.workflow.WorkflowEngine.inheritfrom.label =3D Process in= herited from +org.jahia.engines.workflow.WorkflowEngine.noActions.label =3D Workflow - N= o Actions org.jahia.engines.workflow.WorkflowEngine.noworkflow.label =3D No Workflow org.jahia.engines.workflow.WorkflowEngine.standard.label =3D Jahia standar= d workflow org.jahia.engines.workflow.WorkflowEngine.external.label =3D Other workflo= w(s) Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou= rces_fr.properties URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D18721&= 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/conf/java/JahiaEnginesResources_f= r.properties (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f= r.properties Tue Oct 2 10:21:03 2007 @@ -1020,6 +1020,7 @@ org.jahia.engines.workflow.WorkflowEngine.linkedto.label =3D La publicatio= n est li=C3=A9e =C3=A0 org.jahia.engines.workflow.WorkflowEngine.mandatoryLanguage.label =3D (*) = Langue(s) obligatoire(s) org.jahia.engines.workflow.WorkflowEngine.markForDelete.label =3D =C3= =80 effacer +org.jahia.engines.workflow.WorkflowEngine.noActions.label =3D Workflow - A= ucunes actions org.jahia.engines.workflow.WorkflowEngine.noLanguagesDefined.label =3D Auc= une langue n'a =C3=A9t=C3=A9 d=C3=A9finie pour ce site org.jahia.engines.workflow.WorkflowEngine.noSuffisantRights.label =3D ne d= ispose pas des droits suffisants pour afficher la page actuelle. (Droits d'= administration requis)<BR><BR>Veuillez cocher les droits d'administration d= ans les param=C3=A8tres de la page. org.jahia.engines.workflow.WorkflowEngine.notifyAll.label =3D Notifier tou= t le site Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/work= flow/AdvancedWorkflowEngine.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/engines/workflow/AdvancedWorkflowEngine.jav= a&rev=3D18721&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/A= dvancedWorkflowEngine.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/engines/workflow/A= dvancedWorkflowEngine.java Tue Oct 2 10:21:03 2007 @@ -241,6 +241,14 @@ // If tab selected, which one ? String display =3D null; String action =3D null; + for (Iterator it =3D allOptions.iterator(); it + .hasNext();) { + ActionEntry entry =3D (ActionEntry) it.next(); + if (!JAHIA_WORKFLOW.equals(entry.getWorkflowKey())) { + display =3D entry.getWorkflowKey(); + action =3D entry.getKey(); + } + } final Iterator iterator =3D allOptions.iterator(); while (iterator.hasNext()) { final ActionEntry actionEntry =3D (ActionEntry) iterat= or.next(); Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/wo= rkflow/adv_workflow.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/engines/workflow/adv_workflow.jsp&rev=3D1= 8721&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= /adv_workflow.jsp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow= /adv_workflow.jsp Tue Oct 2 10:21:03 2007 @@ -104,7 +104,7 @@ if (orderedTabs.size() =3D=3D 0) { final String label =3D "noWorkFlow"; orderedTabs.add(label); - final String tabName =3D JahiaResourceBundle.getEngineReso= urce("org.jahia.engines.workflow.WorkflowEngine.noworkflow.label", + final String tabName =3D JahiaResourceBundle.getEngineReso= urce("org.jahia.engines.workflow.WorkflowEngine.noActions.label", jParams, jParams.getLocale()); tabNames.put(label, tabName); activeTabOption =3D "noWorkFlow"; _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
