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
This commit is contained in:
Tuna Aksoy
2014-01-28 11:40:43 +00:00
parent a88193cda7
commit 664dfcf77c

View File

@@ -119,8 +119,9 @@ public class RecordsManagementContainerType extends BaseBehaviourBean
NodeRef parentRef = childAssocRef.getParentRef(); NodeRef parentRef = childAssocRef.getParentRef();
QName parentType = nodeService.getType(parentRef); QName parentType = nodeService.getType(parentRef);
boolean isContentSubType = dictionaryService.isSubClass(childType, ContentModel.TYPE_CONTENT); 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); 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) if (nodeService.hasAspect(child, ASPECT_FILE_PLAN_COMPONENT) == false)
{ {