From 664dfcf77c6b631b8fc2423c4e49253627593e0a Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Tue, 28 Jan 2014 11:40:43 +0000 Subject: [PATCH] Bug fixing for RM-1124, RM-1125, RM-1126 and RM-1127 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@60648 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../model/rma/type/RecordsManagementContainerType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java index 4971eae6b7..79971442b5 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/type/RecordsManagementContainerType.java @@ -119,8 +119,9 @@ public class RecordsManagementContainerType extends BaseBehaviourBean NodeRef parentRef = childAssocRef.getParentRef(); QName parentType = nodeService.getType(parentRef); boolean isContentSubType = dictionaryService.isSubClass(childType, ContentModel.TYPE_CONTENT); + boolean isUnfiledRecordContainer = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER); boolean isUnfiledRecordContainerChild = parentType.equals(RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER_CHILD); - if (isContentSubType == true && isUnfiledRecordContainerChild == true) + if (isContentSubType && (isUnfiledRecordContainer|| isUnfiledRecordContainerChild)) { if (nodeService.hasAspect(child, ASPECT_FILE_PLAN_COMPONENT) == false) {