cvs commit: jahia/core/src/java/org/jahia/services/workflow WorkflowService.java

[Cedric Mailleux]

cmailleux    2005/11/02 16:56:11 CET

  Modified files:
    core/src/java/org/jahia/services/workflow WorkflowService.java 
  Log:
  Don't change state of unviewable content
  
  Revision  Changes    Path
  1.31      +5 -1      
jahia/core/src/java/org/jahia/services/workflow/WorkflowService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/workflow/WorkflowService.java.diff?r1=1.30&r2=1.31&f=h
  
  
  
  Index: WorkflowService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/java/org/jahia/services/workflow/WorkflowService.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- WorkflowService.java      28 Oct 2005 13:04:05 -0000      1.30
  +++ WorkflowService.java      2 Nov 2005 15:56:11 -0000       1.31
  @@ -657,7 +657,11 @@
           // in the page.
           for (Iterator iterator = objects.iterator(); iterator.hasNext();) {
               ContentObject contentObject = (ContentObject) iterator.next();
  -            contentObject.setWorkflowState(languageCodes, newWorkflowState, 
jParams, stateModifContext);
  +            if (!contentObject.getStagingLanguages(false, true).isEmpty()) {
  +                if (!contentObject.checkAdminAccess(jParams.getUser())) {
  +                    contentObject.setWorkflowState(languageCodes, 
newWorkflowState, jParams, stateModifContext);
  +                }
  +            }
               
cache.flushGroup(WORKFLOWSERVICESITE_KEYPREFIX+object.getSiteID());
           }
       }