Author: sshyrkov
Date: Thu Sep 27 19:45:56 2007
New Revision: 18703

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18703&repname=
=3Djahia
Log:
JAHIA-2407: SP3: Distinct workflow in multilang: imposisble to valdiate any=
 more a distinct workflow on a contant object - excepted on the original la=
ng =

http://www.jahia.net/jira/browse/JAHIA-2407
JAHIA-2409: SP3: Modifying my validated distinct workflow does not change t=
he workflow status (should become red)
http://www.jahia.net/jira/browse/JAHIA-2409

Resolution: store the jahia_languages_states entry by update (side effect o=
f JAHIA-2380 fix)

Modified:
    branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowEventListener.java

Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/wor=
kflow/WorkflowEventListener.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/workflow/WorkflowEventListener.jav=
a&rev=3D18703&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/=
WorkflowEventListener.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/workflow/=
WorkflowEventListener.java Thu Sep 27 19:45:56 2007
@@ -28,6 +28,7 @@
 import org.jahia.params.ProcessingContext;
 import org.jahia.params.SoapParamBean;
 import org.jahia.registries.ServicesRegistry;
+import org.jahia.services.pages.ContentPage;
 import org.jahia.services.sites.JahiaSite;
 import org.jahia.services.sites.SiteLanguageSettings;
 import org.jahia.services.usermanager.JahiaUser;
@@ -141,7 +142,7 @@
 =

             mode =3D service.getInheritedMode(mainObject);
 =

-            if (mode !=3D WorkflowService.INACTIVE && mainObject.getLangua=
gesStates().containsKey(languageCode)) {
+            if (mode !=3D WorkflowService.INACTIVE && (!(mainObject instan=
ceof ContentPage) || mainObject.getLanguagesStates().containsKey(languageCo=
de))) {
                 service.storeLanguageState((ContentObjectKey) mainObject.g=
etObjectKey(),languageCode,EntryLoadRequest.STAGING_WORKFLOW_STATE, mainObj=
ect.getSiteID());
             }
 =


_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list

Reply via email to