From 9c52e1e07b5b4ebcef87991241fb5047645490b2 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Wed, 28 Jan 2015 15:39:48 +0000
Subject: [PATCH] RM-978 (Unable to navigate to copied folder from a
 collaboration site to RM site)  * Fixed move operation related failing tests
 in RM site

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@94253 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../rm-model-context.xml                      |  2 +-
 .../model/rma/type/ObjectType.java            | 37 +++++++++++++++----
 .../integration/issue/IssueTestSuite.java     |  4 +-
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
index 73a4ccbbdf..99d02683da 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
@@ -57,7 +57,7 @@
    </bean>
 
    <!-- dm model type -->
-   <!-- <bean id="dm.object" class="org.alfresco.module.org_alfresco_module_rm.model.rma.type.ObjectType" parent="rm.baseBehaviour"/> -->
+   <bean id="dm.object" class="org.alfresco.module.org_alfresco_module_rm.model.rma.type.ObjectType" parent="rm.baseBehaviour"/>
 
    <!--  rma model types -->
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/ObjectType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/ObjectType.java
index 0dd76402f8..82dc1359f2 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/ObjectType.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/ObjectType.java
@@ -56,20 +56,33 @@ public class ObjectType extends BaseBehaviourBean implements NodeServicePolicies
         mandatory("oldChildAssocRef", oldChildAssocRef);
         mandatory("newChildAssocRef", newChildAssocRef);
 
+        NodeRef sourceParent = oldChildAssocRef.getParentRef();
+        boolean isSourceParentFilePlanComponent = isFilePlanComponent(sourceParent);
+
+        NodeRef targetParent = newChildAssocRef.getParentRef();
+        boolean isTargetParentFilePlanComponent = isFilePlanComponent(targetParent);
+
+        // If we are doing the move operation within the RM site then we can stop here
+        // The method should just check move operations from outside of RM into the RM site
+        if (isSourceParentFilePlanComponent && isTargetParentFilePlanComponent)
+        {
+            return;
+        }
+
         NodeRef object = oldChildAssocRef.getChildRef();
         QName objectType = nodeService.getType(object);
 
-        NodeRef target = newChildAssocRef.getParentRef();
-        boolean isTargetFilePlanComponent = isFilePlanComponent(target);
-
-        if (!objectType.equals(ContentModel.TYPE_CONTENT) && isTargetFilePlanComponent)
+        // Only documents can be moved into the RM site
+        if (!objectType.equals(ContentModel.TYPE_CONTENT) && isTargetParentFilePlanComponent)
         {
             throw new AlfrescoRuntimeException("Only documents can be moved from a collaboration site into a RM site.");
         }
 
-        if (isTargetFilePlanComponent && !isRecordFolder(target))
+        // Documents can be moved only into a RM folder
+        NodeRef target = newChildAssocRef.getChildRef();
+        if (isTargetParentFilePlanComponent && !isRecordFolder(target))
         {
-            throw new AlfrescoRuntimeException("A document can only be copied into a folder in RM site.");
+            throw new AlfrescoRuntimeException("A document can only be moved into a folder in RM site.");
         }
     }
 
@@ -87,10 +100,18 @@ public class ObjectType extends BaseBehaviourBean implements NodeServicePolicies
 //        mandatory("targetNodeRef", targetNodeRef);
 //
 //        NodeRef sourceParentNodeRef = nodeService.getPrimaryParent(sourceNodeRef).getParentRef();
-//        boolean isSourceParentNodeFilePlanComponent = isFilePlanComponent(sourceParentNodeRef);
+//        boolean isSourceParentFilePlanComponent = isFilePlanComponent(sourceParentNodeRef);
 //        boolean isTargetNodeFilePlanComponent = isFilePlanComponent(targetNodeRef);
 //
-//        if (!isSourceParentNodeFilePlanComponent && isTargetNodeFilePlanComponent)
+//        // If we are doing the copy operation within the RM site then we can stop here
+//        // The method should just check copy operations from outside of RM into the RM site
+//        if (isSourceParentFilePlanComponent && isTargetNodeFilePlanComponent)
+//        {
+//            return;
+//        }
+//
+//        // Do not allow to copy anything outside of RM site into the RM site
+//        if (!isSourceParentFilePlanComponent && isTargetNodeFilePlanComponent)
 //        {
 //            throw new AlfrescoRuntimeException("Nothing can be copied from a collaboration site into a RM site.");
 //        }
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
index b73a1f1df5..100ef501fc 100755
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
@@ -43,8 +43,8 @@ import org.junit.runners.Suite.SuiteClasses;
     RM994Test.class,
     RM1039Test.class,
     RM1799Test.class,
-    RM1814Test.class/*,
-    RM978Test.class*/
+    RM1814Test.class,
+    RM978Test.class
 })
 public class IssueTestSuite
 {