mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Point checkin.
Reorg to allow sandbox-related constants to be accessed more easily from other compilation units. AVMConstants had become a dumping ground for things that had nothing to do with const values. Therefore, this is now AVMUtil, and sandbox-related constants have been moved to org.alfresco.sandbox.SandboxConstants, which builds in repository. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -33,7 +33,7 @@ import org.alfresco.util.Pair;
|
||||
import org.alfresco.web.action.ActionEvaluator;
|
||||
import org.alfresco.web.bean.repository.Node;
|
||||
import org.alfresco.web.bean.repository.Repository;
|
||||
import org.alfresco.web.bean.wcm.AVMConstants;
|
||||
import org.alfresco.web.bean.wcm.AVMUtil;
|
||||
|
||||
/**
|
||||
* UI Action Evaluator - return true if the node is not part of an in-progress WCM workflow.
|
||||
@@ -56,7 +56,7 @@ public class WCMWorkflowDeletedEvaluator implements ActionEvaluator
|
||||
|
||||
// evaluate to true if we are within a workflow store (i.e. list of resources in the task
|
||||
// dialog) or not part of an already in-progress workflow
|
||||
return (AVMConstants.isWorkflowStore(AVMConstants.getStoreName(path)) ||
|
||||
return (AVMUtil.isWorkflowStore(AVMUtil.getStoreName(path)) ||
|
||||
avmService.hasAspect(version, path, AVMSubmittedAspect.ASPECT) == false);
|
||||
}
|
||||
}
|
||||
|
@@ -33,7 +33,7 @@ import org.alfresco.util.Pair;
|
||||
import org.alfresco.web.action.ActionEvaluator;
|
||||
import org.alfresco.web.bean.repository.Node;
|
||||
import org.alfresco.web.bean.repository.Repository;
|
||||
import org.alfresco.web.bean.wcm.AVMConstants;
|
||||
import org.alfresco.web.bean.wcm.AVMUtil;
|
||||
|
||||
/**
|
||||
* UI Action Evaluator - return true if the node is not part of an in-progress WCM workflow.
|
||||
@@ -55,7 +55,7 @@ public class WCMWorkflowEvaluator implements ActionEvaluator
|
||||
|
||||
// evaluate to true if we are not deleted and within a workflow store (i.e. list of resources
|
||||
// in the task dialog) or not part of an already in-progress workflow
|
||||
return ((AVMConstants.isWorkflowStore(AVMConstants.getStoreName(path)) ||
|
||||
return ((AVMUtil.isWorkflowStore(AVMUtil.getStoreName(path)) ||
|
||||
avmService.hasAspect(version, path, AVMSubmittedAspect.ASPECT) == false) &&
|
||||
avmService.lookup(version, path) != null);
|
||||
}
|
||||
|
Reference in New Issue
Block a user