From d50b7a20a90bd1f3d53f5dcb19d2ffdb6c352808 Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Thu, 13 Mar 2014 10:19:45 +0000
Subject: [PATCH] Refactor RM model so that rma:hold is used

 * rma:holdContainerChild removed
 * capabilities, forms and actions updated
 * UI tests updated
 * relates to RM-1203, RM-1205, RM-1209



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@64116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rm-capabilities-record-context.xml        |  3 +--
 .../rm-capabilities-recordfolder-context.xml  |  4 ++--
 .../model/recordsModel.xml                    | 21 ++++++++-----------
 .../rm-ui-evaluators-context.xml              |  6 +++---
 .../fileplan/FilePlanComponentKind.java       |  1 -
 .../fileplan/FilePlanServiceImpl.java         |  4 ----
 .../jscript/app/JSONConversionComponent.java  |  5 -----
 .../model/RecordsManagementModel.java         |  9 +-------
 8 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
index c4aab77f5c..743a0f9ea3 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-record-context.xml
@@ -279,6 +279,7 @@
       <property name="permission" value="MoveRecords"/>
       <property name="undetermined" value="true" />
       <property name="kind" value="RECORD" />
+      <property name="private" value="true"/>
       <property name="conditions">
          <map>
             <entry key="capabilityCondition.filling" value="true"/>
@@ -288,8 +289,6 @@
          </map>
       </property>
       <property name="targetCapability" ref="rmFilePermissionOnly"/>
-      <property name="group"><ref bean="recordsGroup"/></property>
-      <property name="index" value="45" />
    </bean>
 
    <bean id="rmRejectRecordsCapability"
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
index 65c6fbd6e5..7aad8336d2 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/capability/rm-capabilities-recordfolder-context.xml
@@ -238,7 +238,7 @@
       <property name="permission" value="CreateModifyDestroyFolders"/>
       <property name="kinds">
          <list>
-            <value>HOLD_CONTAINER_CHILD</value>
+            <value>HOLD</value>
          </list>
       </property>
       <property name="conditions">
@@ -257,7 +257,7 @@
       <property name="permission" value="CreateModifyDestroyFolders"/>
       <property name="kinds">
          <list>
-            <value>HOLD_CONTAINER_CHILD</value>
+            <value>HOLD</value>
          </list>
       </property>
       <property name="conditions">
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
index 0935b01903..e359725745 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
@@ -96,6 +96,7 @@
          <parent>rma:recordsManagementContainer</parent>
       </type>
 
+	  <-- TODO rename to unfiledRecordFolder -->
       <type name="rma:unfiledRecordContainerChild">
          <title>Unfiled Record Container Child</title>
          <parent>rma:recordsManagementContainer</parent>
@@ -103,17 +104,12 @@
 
       <type name="rma:holdContainer">
          <title>Hold Container</title>
-         <parent>rma:hold</parent>
+         <parent>rma:recordsManagementContainer</parent>
          <mandatory-aspects>
             <aspect>rma:countable</aspect>
          </mandatory-aspects>
       </type>
 
-      <type name="rma:holdContainerChild">
-         <title>Hold Container Child</title>
-         <parent>rma:hold</parent>
-      </type>
-
       <type name="rma:transferContainer">
       	 <title>Transfer Container</title>
          <parent>rma:recordsManagementContainer</parent>
@@ -511,7 +507,7 @@
 
       <type name="rma:hold">
          <title>Hold</title>
-         <parent>cm:folder</parent>
+         <parent>rma:recordsManagementContainer</parent>
          <archive>false</archive>
 
          <properties>
@@ -522,6 +518,12 @@
                <mandatory>true</mandatory>
             </property>
 
+            <property name="rma:deleteWhenEmpty">
+               <title>Delete When Empty</title>
+               <type>d:boolean</type>
+               <default>false</default>
+            </property>
+
          </properties>
 
          <associations>
@@ -541,11 +543,6 @@
 
          </associations>
 
-         <mandatory-aspects>
-            <aspect>cm:titled</aspect>
-            <aspect>rma:filePlanComponent</aspect>
-         </mandatory-aspects>
-
       </type>
 
       <type name="rma:transfer">
diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
index c19156f27c..ff275ce8f1 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-ui-evaluators-context.xml
@@ -218,7 +218,7 @@
             <value>RECORD_FOLDER</value>
             <value>RECORD</value>
             <value>UNFILED_RECORD_CONTAINER_CHILD</value>
-            <value>HOLD_CONTAINER_CHILD</value>
+            <value>HOLD</value>
          </set>
       </property>
       <property name="capability" value ="UpdateProperties"/>
@@ -380,7 +380,7 @@
             <value>RECORD_FOLDER</value>
             <value>RECORD</value>
             <value>UNFILED_RECORD_CONTAINER_CHILD</value>
-            <value>HOLD_CONTAINER_CHILD</value>
+            <value>HOLD</value>
          </set>
       </property>
       <property name="capability" value="Delete"/>
@@ -397,7 +397,7 @@
             <value>UNFILED_RECORD_CONTAINER</value>
             <value>UNFILED_RECORD_CONTAINER_CHILD</value>
             <value>HOLD_CONTAINER</value>
-            <value>HOLD_CONTAINER_CHILD</value>
+            <value>HOLD</value>
          </set>
       </property>
       <property name="capability" value ="ManageAccessRights"/>
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java
index 68e53466cd..0452585ad9 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanComponentKind.java
@@ -36,7 +36,6 @@ public enum FilePlanComponentKind
     TRANSFER,
     HOLD,
     HOLD_CONTAINER,
-    HOLD_CONTAINER_CHILD,
     DISPOSITION_SCHEDULE,
     UNFILED_RECORD_CONTAINER,
     UNFILED_RECORD_CONTAINER_CHILD;
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
index 2177546717..756a186f66 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
@@ -218,10 +218,6 @@ public class FilePlanServiceImpl extends ServiceBaseImpl
             {
                 result = FilePlanComponentKind.HOLD_CONTAINER;
             }
-            else if (instanceOf(nodeRef, TYPE_HOLD_CONTAINER_CHILD))
-            {
-                result = FilePlanComponentKind.HOLD_CONTAINER_CHILD;
-            }
             else if (getFreezeService().isHold(nodeRef))
             {
                 result = FilePlanComponentKind.HOLD;
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
index 244699c2de..91c80df9ec 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
@@ -260,11 +260,6 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JSONC
                     result = "hold-container";
                     break;
                 }
-                case HOLD_CONTAINER_CHILD:
-                {
-                    result = "hold-container-child";
-                    break;
-                }
                 case TRANSFER:
                 {
                     result = "transfer-container";
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
index 4860a1672b..d6f418e7ce 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
@@ -65,8 +65,7 @@ public interface RecordsManagementModel extends RecordsManagementCustomModel
 
     // Hold container
     static final QName TYPE_HOLD_CONTAINER = QName.createQName(RM_URI, "holdContainer");
-    static final QName TYPE_HOLD_CONTAINER_CHILD = QName.createQName(RM_URI, "holdContainerChild");
-
+    
     // Transfer container
     static final QName TYPE_TRANSFER_CONTAINER = QName.createQName(RM_URI, "transferContainer");
 
@@ -104,12 +103,6 @@ public interface RecordsManagementModel extends RecordsManagementCustomModel
     static final QName ASPECT_RECORD = QName.createQName(RM_URI, "record");
     static final QName PROP_DATE_FILED = QName.createQName(RM_URI, "dateFiled");
     static final QName PROP_ORIGIONAL_NAME = QName.createQName(RM_URI, "origionalName");
-    //static final QName PROP_ORIGINATOR = QName.createQName(RM_URI, "originator");
-    //static final QName PROP_ORIGINATING_ORGANIZATION = QName.createQName(RM_URI, "originatingOrganization");
-    //static final QName PROP_PUBLICATION_DATE = QName.createQName(RM_URI, "publicationDate");
-    //static final QName PROP_MEDIA_TYPE = QName.createQName(RM_URI, "mediaType");
-    //static final QName PROP_FORMAT = QName.createQName(RM_URI, "format");
-    //static final QName PROP_DATE_RECEIVED = QName.createQName(RM_URI, "dateReceived");
 
     // Common record details
     static final QName PROP_LOCATION = QName.createQName(RM_URI, "location");