Merge remote-tracking branch 'remotes/origin/feature-2.7/RM-6786_FileCan'tBeDeclaredAsRecord' into feature-2.7/RM-6786_DeclareFileWithRecVersionAsRecord_test_no

This commit is contained in:
cagache
2019-03-14 16:34:48 +02:00

View File

@@ -144,8 +144,8 @@ public class VersionRecordAspect extends BaseBehaviourBean
@Behaviour(kind = BehaviourKind.CLASS, notificationFrequency = NotificationFrequency.FIRST_EVENT)
public void beforeAddAspect(NodeRef nodeRef, QName qName)
{
// if the node is a record the behaviour shouldn't be triggered
if (!nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_RECORD))
// 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);