From 6ffe457f8fba417b0c93e376c2cd98fe0a459974 Mon Sep 17 00:00:00 2001 From: Andrew Hind Date: Mon, 19 Nov 2012 10:13:30 +0000 Subject: [PATCH] Fix for ALF-16837 CMIS allowable actions show incorrectly for working copy and checked out doc git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../opencmis/mapping/CurrentVersionEvaluator.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java b/source/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java index 852cdd6fd8..e89ab2c10a 100644 --- a/source/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java +++ b/source/java/org/alfresco/opencmis/mapping/CurrentVersionEvaluator.java @@ -57,10 +57,21 @@ public class CurrentVersionEvaluator extends AbstractActionEvaluator public boolean isAllowed(CMISNodeInfo nodeInfo) { - if (!nodeInfo.isCurrentVersion()) + if(nodeInfo.hasPWC()) { - return nonCurrentVersionValue; + if(!nodeInfo.isPWC()) + { + return nonCurrentVersionValue; + } } + else + { + if (!nodeInfo.isCurrentVersion()) + { + return nonCurrentVersionValue; + } + } + return currentVersionEvaluator == null ? currentVersionValue : currentVersionEvaluator.isAllowed(nodeInfo); }