Merge branch 'feature-2.7/RM-6786_FileCan'tBeDeclaredAsRecord' into 'release/V2.7'

RM-6786 Added check for records

See merge request records-management/records-management!1135
This commit is contained in:
Roxana Lucanu
2019-03-15 07:03:50 +00:00

View File

@@ -30,6 +30,7 @@ package org.alfresco.module.org_alfresco_module_rm.model.rma.aspect;
import java.util.Set;
import org.alfresco.module.org_alfresco_module_rm.model.BaseBehaviourBean;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.relationship.Relationship;
import org.alfresco.module.org_alfresco_module_rm.relationship.RelationshipService;
import org.alfresco.module.org_alfresco_module_rm.version.RecordableVersionService;
@@ -143,7 +144,11 @@ public class VersionRecordAspect extends BaseBehaviourBean
@Behaviour(kind = BehaviourKind.CLASS, notificationFrequency = NotificationFrequency.FIRST_EVENT)
public void beforeAddAspect(NodeRef nodeRef, QName qName)
{
//create a new content URL for the version record
createNewContentURL(nodeRef);
// if the node is the originating one the behaviour shouldn't be triggered
if (!nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_RECORD_ORIGINATING_DETAILS))
{
//create a new content URL for the version record
createNewContentURL(nodeRef);
}
}
}