From caeca3c66d4981d5bdb565d255112f6f95e34dc6 Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Thu, 5 Sep 2013 05:47:59 +0000
Subject: [PATCH] RM-830: It's impossible to undo Cut Off for folders and
 records

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@54958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../condition/LastDispositionActionCondition.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java
index d1a9942666..f645c87c00 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/LastDispositionActionCondition.java
@@ -49,6 +49,18 @@ public class LastDispositionActionCondition extends AbstractCapabilityCondition
      */
     @Override
     public boolean evaluate(NodeRef nodeRef)
+    {
+        boolean result = evaluateImpl(nodeRef);
+        
+        if (result == false && recordService.isRecord(nodeRef) == true)
+        {
+            result = evaluateImpl(nodeService.getPrimaryParent(nodeRef).getParentRef());
+        }
+        
+        return result;
+    }
+    
+    private boolean evaluateImpl(NodeRef nodeRef)
     {
         boolean result = false;
         DispositionAction dispositionAction = dispositionService.getLastCompletedDispostionAction(nodeRef);