From 4514eb392eba0c8a8c9a686f26e787bc269658e3 Mon Sep 17 00:00:00 2001
From: Roxana Dina <roxana.dina@savatech.com>
Date: Mon, 27 Jun 2016 17:41:13 +0300
Subject: [PATCH] RM-3265 Disable "Move" action for closed record folder.
 Change the display order of the actions for destroyed record folders so that
 it remains consistent with the order at other dispositions steps. Rename
 Movable(CapabilityCondition) to MovableRecordFolder(CapabilityCondition) as
 this condition is designed especially for record folders.

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