cvs commit: jahia/core/src/java/org/jahia/engines/shared Page_Field.java

[Thomas Draier]

tdraier     2004/12/08 18:45:22 CET

  Modified files:
    core/src/java/org/jahia/engines/shared Page_Field.java 
  Log:
  reset page workflow mode when moving a page, if it was linked to its parent
  
  Revision  Changes    Path
  1.15      +4 -0      
jahia/core/src/java/org/jahia/engines/shared/Page_Field.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/engines/shared/Page_Field.java.diff?r1=1.14&r2=1.15&f=h
  
  
  
  Index: Page_Field.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/engines/shared/Page_Field.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- Page_Field.java   8 Dec 2004 11:28:45 -0000       1.14
  +++ Page_Field.java   8 Dec 2004 17:45:22 -0000       1.15
  @@ -68,6 +68,7 @@
   import org.jahia.services.version.EntryLoadRequest;
   import org.jahia.services.version.StateModificationContext;
   import org.jahia.services.workflow.WorkflowEvent;
  +import org.jahia.services.workflow.WorkflowService;
   
   import java.io.UnsupportedEncodingException;
   import java.util.*;
  @@ -599,6 +600,9 @@
               int oldParentPageID = 
contentPage.getParentID(jParams.getEntryLoadRequest());
               contentPage.setParentID(pageBean.getParentID(), jParams);
               contentPage.commitChanges(true);
  +            if (WorkflowService.getInstance().getWorkflowMode(contentPage) 
== WorkflowService.LINKED) {
  +                WorkflowService.getInstance().setWorkflowMode(contentPage, 
WorkflowService.INHERITED,null,null,jParams);
  +            }
               JahiaEvent objectCreatedEvent = new JahiaEvent(this, jParams, 
contentPage);
               ServicesRegistry.getInstance ().getJahiaEventService ()
                   .fireContentObjectUpdated(objectCreatedEvent);