inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-978 (Unable to navigate to copied folder from a collaboration site to RM site)

Browse Source 
* 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
This commit is contained in:
Tuna Aksoy
2015-01-28 15:39:48 +00:00
parent cffb19675e
commit 9c52e1e07b
3 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/config/alfresco/module/org_alfresco_module_rm/rm-model-context.xml
View File

@@ -57,7 +57,7 @@
</bean> </bean>
<!-- dm model type --> <!-- 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 --> <!-- rma model types -->

37
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/ObjectType.java
View File

@@ -56,20 +56,33 @@ public class ObjectType extends BaseBehaviourBean implements NodeServicePolicies
mandatory("oldChildAssocRef", oldChildAssocRef); mandatory("oldChildAssocRef", oldChildAssocRef);
mandatory("newChildAssocRef", newChildAssocRef); 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(); NodeRef object = oldChildAssocRef.getChildRef();
QName objectType = nodeService.getType(object); QName objectType = nodeService.getType(object);
NodeRef target = newChildAssocRef.getParentRef(); // Only documents can be moved into the RM site
boolean isTargetFilePlanComponent = isFilePlanComponent(target); if (!objectType.equals(ContentModel.TYPE_CONTENT) && isTargetParentFilePlanComponent)
if (!objectType.equals(ContentModel.TYPE_CONTENT) && isTargetFilePlanComponent)
{ {
throw new AlfrescoRuntimeException("Only documents can be moved from a collaboration site into a RM site."); 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); // mandatory("targetNodeRef", targetNodeRef);
// //
// NodeRef sourceParentNodeRef = nodeService.getPrimaryParent(sourceNodeRef).getParentRef(); // NodeRef sourceParentNodeRef = nodeService.getPrimaryParent(sourceNodeRef).getParentRef();
// boolean isSourceParentNodeFilePlanComponent = isFilePlanComponent(sourceParentNodeRef); // boolean isSourceParentFilePlanComponent = isFilePlanComponent(sourceParentNodeRef);
// boolean isTargetNodeFilePlanComponent = isFilePlanComponent(targetNodeRef); // 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."); // throw new AlfrescoRuntimeException("Nothing can be copied from a collaboration site into a RM site.");
// } // }

4
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/issue/IssueTestSuite.java
View File

@@ -43,8 +43,8 @@ import org.junit.runners.Suite.SuiteClasses;
RM994Test.class, RM994Test.class,
RM1039Test.class, RM1039Test.class,
RM1799Test.class, RM1799Test.class,
RM1814Test.class/*, RM1814Test.class,
RM978Test.class*/ RM978Test.class
}) })
public class IssueTestSuite public class IssueTestSuite
{ {