From 3b0b785a8971432787793da23e75052e1716c54c Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Thu, 29 Jan 2015 10:27:17 +0000
Subject: [PATCH 1/2] Changed artifact version for 2.3 Enterprise

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@94333 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml               | 2 +-
 rm-automation/pom.xml | 2 +-
 rm-server/pom.xml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0da1def46a..4f2b578766 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <groupId>org.alfresco</groupId>
    <artifactId>alfresco-rm-parent</artifactId>
    <packaging>pom</packaging>
-   <version>2.3-ent-SNAPSHOT</version>
+   <version>2.3-SNAPSHOT</version>
    <name>Alfresco Records Management</name>
 
    <url>http://www.alfresco.org/</url>
diff --git a/rm-automation/pom.xml b/rm-automation/pom.xml
index d991d677d7..1221af32e3 100644
--- a/rm-automation/pom.xml
+++ b/rm-automation/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.alfresco</groupId>
         <artifactId>alfresco-rm-parent</artifactId>
-        <version>2.3-ent-SNAPSHOT</version>
+        <version>2.3-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>alfresco-rm-automation</artifactId>
diff --git a/rm-server/pom.xml b/rm-server/pom.xml
index d01da7b681..5dc43e4252 100644
--- a/rm-server/pom.xml
+++ b/rm-server/pom.xml
@@ -5,7 +5,7 @@
    <parent>
       <groupId>org.alfresco</groupId>
       <artifactId>alfresco-rm-parent</artifactId>
-      <version>2.3-ent-SNAPSHOT</version>
+      <version>2.3-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>alfresco-rm-server</artifactId>

From 5f0e38045c3dbfc7488d8cf3023caf72ad383bf3 Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Thu, 29 Jan 2015 17:22:52 +0000
Subject: [PATCH 2/2] RM-978 (Unable to navigate to copied folder from a
 collaboration site to RM site)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@94395 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org_alfresco_module_rm/model/rma/type/ObjectType.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 b68236fe98..450b46ff58 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
@@ -101,17 +101,19 @@ public class ObjectType extends BaseBehaviourBean implements NodeServicePolicies
 
         NodeRef sourceParentNodeRef = nodeService.getPrimaryParent(sourceNodeRef).getParentRef();
         boolean isSourceParentFilePlanComponent = isFilePlanComponent(sourceParentNodeRef);
-        boolean isTargetNodeFilePlanComponent = isFilePlanComponent(targetNodeRef);
+
+        NodeRef targetParentNodeRef = nodeService.getPrimaryParent(targetNodeRef).getParentRef();
+        boolean isTargetNodeParentFilePlanComponent = isFilePlanComponent(targetParentNodeRef);
 
         // 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)
+        if (isSourceParentFilePlanComponent && isTargetNodeParentFilePlanComponent)
         {
             return;
         }
 
         // Do not allow to copy anything outside of RM site into the RM site
-        if (!isSourceParentFilePlanComponent && isTargetNodeFilePlanComponent)
+        if (!isSourceParentFilePlanComponent && isTargetNodeParentFilePlanComponent)
         {
             throw new AlfrescoRuntimeException("Nothing can be copied from a collaboration site into a RM site.");
         }