cvs commit: jahia/core/src/java/org/jahia/services/fields ContentField.java

[Cedric Mailleux]

cmailleux    2005/12/13 15:06:11 CET

  Modified files:
    core/src/java/org/jahia/services/fields ContentField.java 
  Log:
  Resolve JAHIA-576
  
  Revision  Changes    Path
  1.42      +4 -1      
jahia/core/src/java/org/jahia/services/fields/ContentField.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/fields/ContentField.java.diff?r1=1.41&r2=1.42&f=h
  
  
  
  Index: ContentField.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/fields/ContentField.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- ContentField.java 6 Dec 2005 12:11:33 -0000       1.41
  +++ ContentField.java 13 Dec 2005 14:06:10 -0000      1.42
  @@ -60,6 +60,7 @@
   import org.jahia.services.usermanager.JahiaUser;
   import org.jahia.services.version.*;
   import org.jahia.services.workflow.WorkflowEvent;
  +import org.jahia.services.workflow.WorkflowService;
   import org.jahia.utils.xml.XMLSerializationOptions;
   import org.jahia.utils.xml.XmlWriter;
   import org.jahia.services.version.RestoreVersionStateModificationContext;
  @@ -640,7 +641,9 @@
   
                   // special trick for ContentPageFields - do not validate the 
field (shared) until all
                   // languages for the contentPage are validated
  -                if 
(staEntryState.getLanguageCode().equals(ContentField.SHARED_LANGUAGE)) {
  +                // Pass through the trick in case of no workflow
  +                if 
(staEntryState.getLanguageCode().equals(ContentField.SHARED_LANGUAGE) &&
  +                    
ServicesRegistry.getInstance().getWorkflowService().getInheritedMode(this)!= 
WorkflowService.INACTIVE) {
                       Map contentLanguageStates = 
getContentLanguageStates(staEntryState);
                       if (contentLanguageStates.containsValue(new 
Integer(ContentObjectEntryState.WORKFLOW_STATE_START_STAGING))) {
                           continue;