From d8f66a6994900200409e02bbca4960ff84750a18 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Wed, 14 Aug 2013 19:39:19 +0000
Subject: [PATCH] Fixed the following issues  - RM-829 (Could not cut off
 folder if it's contain a record)  - 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@54093 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rm-capabilities-disposition-context.xml          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
index fa8743e9c0..478d35c3ce 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-disposition-context.xml
@@ -121,7 +121,7 @@
       <property name="group"><ref bean="dispositionAndTransfersGroup"/></property>
       <property name="index" value="60" />
    </bean>
-   
+
    <!--  file destruction report capability -->
    <bean id="rmFileDestructionReportCapability"
          parent="declarativeCapability">
@@ -132,17 +132,17 @@
             <value>RECORD</value>									   <!--  Only applies to records and record folders -->
             <value>RECORD_FOLDER</value>
          </list>
-      </property> 
+      </property>
       <property name="conditions">
          <map>
             <entry key="capabilityCondition.filling" value="true"/>		<!--  Must have read and file permissions -->
             <entry key="capabilityCondition.frozen" value="false"/>     <!--  Not for frozen records -->
             <entry key="capabilityCondition.destroyed" value="true"/>   <!--  Only for destroyed things -->
          </map>
-      </property>      
+      </property>
       <property name="group"><ref bean="dispositionAndTransfersGroup"/></property>      <!--  Part of the disposition group of capabilities -->
       <property name="index" value="110" />
-   </bean> 
+   </bean>
 
    <!--  Non-assignable Capabilities -->
 
@@ -226,7 +226,6 @@
       <property name="conditions">
          <map>
             <entry key="capabilityCondition.cutoff" value="false"/>
-            <entry key="capabilityCondition.cutoffIsScheduled" value="true" />
          </map>
       </property>
    </bean>
@@ -250,11 +249,10 @@
          <map>
             <entry key="capabilityCondition.cutoff" value="true"/>
             <entry key="capabilityCondition.isTransferring" value="false" />
-            <entry key="capabilityCondition.lastDispositionActionCutoff" value="true"/>
          </map>
       </property>
    </bean>
-   
+
    <bean id="rmDestroyCapability"
       parent="compositeCapability">
       <property name="name" value="Destroy"/>