From 57b55471679af6b5587fb2aaf3dc60864bae2270 Mon Sep 17 00:00:00 2001
From: Roxana Dina <roxana.dina@savatech.ro>
Date: Tue, 5 Jul 2016 15:48:51 +0300
Subject: [PATCH] Revert "Merge branch
 'feature-2.4/RM-3265_NoOptionToMoveADestroyedRecordFolder' into
 'release/V2.4'"

This reverts commit 3550fe3a2857b986ab9652f03f150d176d039dbe, reversing
changes made to f87d5ca0b806ba4fc8086365ebf932c65bf350b2.
---
 .../capability/rm-capabilities-condition-context.xml          | 4 ++--
 .../capability/rm-capabilities-recordfolder-context.xml       | 2 +-
 ...pabilityCondition.java => MovableCapabilityCondition.java} | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/{MovableRecordFolderCapabilityCondition.java => MovableCapabilityCondition.java} (86%)

diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
index e90a241f9f..d5509295c4 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-condition-context.xml
@@ -60,9 +60,9 @@
           class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.TransferredCapabilityCondition">
     </bean>
 
-    <bean id="capabilityCondition.movableRecordFolder"
+    <bean id="capabilityCondition.movable"
           parent="capabilityCondition.base"
-          class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.MovableRecordFolderCapabilityCondition">
+          class="org.alfresco.module.org_alfresco_module_rm.capability.declarative.condition.MovableCapabilityCondition">
     </bean>
 
     <bean id="capabilityCondition.destroyed"
diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
index 74f1183507..dc42dd25f2 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
@@ -129,7 +129,7 @@
       </property>
       <property name="conditions">
          <map>
-            <entry key="capabilityCondition.movableRecordFolder" value="true"/>
+            <entry key="capabilityCondition.movable" value="true"/>
          </map>
       </property>
       <property name="targetCapability" ref="rmCreateRecordFolderCapability"/>
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MovableRecordFolderCapabilityCondition.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MovableCapabilityCondition.java
similarity index 86%
rename from rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MovableRecordFolderCapabilityCondition.java
rename to rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MovableCapabilityCondition.java
index 787221f457..99aebc7f29 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MovableRecordFolderCapabilityCondition.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/declarative/condition/MovableCapabilityCondition.java
@@ -36,7 +36,7 @@ import org.alfresco.service.cmr.repository.NodeRef;
  * @since 2.4.1
  *
  */
-public class MovableRecordFolderCapabilityCondition extends AbstractCapabilityCondition
+public class MovableCapabilityCondition extends AbstractCapabilityCondition
 {
 
     /**
@@ -47,6 +47,6 @@ public class MovableRecordFolderCapabilityCondition extends AbstractCapabilityCo
     {
         if (nodeService.hasAspect(nodeRef, ASPECT_GHOSTED) && dispositionService.isDisposableItemCutoff(nodeRef))
             return true;
-        return ! (dispositionService.isDisposableItemCutoff(nodeRef) || recordFolderService.isRecordFolderClosed(nodeRef));
+        return !dispositionService.isDisposableItemCutoff(nodeRef);
     }
 }