inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
6447: Office Add-Ins: Files which missed CHK-1041
   6448: Fix for WCM-692 (bug in parsing of port number in filesystem deployment)
   6449: Office Webscripts: Fix for typo when getting task resource nodes
   6450: Fix for WCM-707 (content launch section is shown when there is no workflow defined)
   6451: Removed unused AVM hooks in content stream listener
   6452: Bootstrap processes killed on VM shutdown.
   6453: Fix for WCM-720 - actions in Task Dialog were no longer available after lock checking added to client ui evaluators.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6734 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-09-10 22:18:29 +00:00
parent 97b5b391c8
commit d0beb33499
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/web/action/evaluator/WCMWorkflowEvaluator.java
View File

@@ -46,20 +46,20 @@ public class WCMWorkflowEvaluator extends WCMLockEvaluator
*/
public boolean evaluate(final Node node)
{
final Pair<Integer, String> p = AVMNodeConverter.ToAVMVersionPath(node.getNodeRef());
final String path = p.getSecond();
boolean proceed = false;
if (super.evaluate(node))
if (AVMUtil.isWorkflowStore(AVMUtil.getStoreName(path)) || super.evaluate(node))
{
final FacesContext facesContext = FacesContext.getCurrentInstance();
final AVMService avmService = Repository.getServiceRegistry(facesContext).getAVMService();
final Pair<Integer, String> p = AVMNodeConverter.ToAVMVersionPath(node.getNodeRef());
final int version = p.getFirst();
final String path = p.getSecond();
// 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
proceed = ((AVMUtil.isWorkflowStore(AVMUtil.getStoreName(path)) ||
!((AVMNode)node).isWorkflowInFlight()) &&
avmService.lookup(version, path) != null);
avmService.lookup(p.getFirst(), path) != null);
}
return proceed;
}