From 1b9d4306c8988d5c9be4b23130a82caee3ee76d3 Mon Sep 17 00:00:00 2001 From: rlucanu Date: Thu, 14 Mar 2019 09:46:29 +0200 Subject: [PATCH 1/2] RM-6786 Added check for records --- .../model/rma/aspect/VersionRecordAspect.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VersionRecordAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VersionRecordAspect.java index f4712a8995..cc4851a39e 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VersionRecordAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VersionRecordAspect.java @@ -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 a record the behaviour shouldn't be triggered + if (!nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_RECORD)) + { + //create a new content URL for the version record + createNewContentURL(nodeRef); + } } } From 2351eafd65e35e614aba40d4aec3237bbd122930 Mon Sep 17 00:00:00 2001 From: rlucanu Date: Thu, 14 Mar 2019 16:24:50 +0200 Subject: [PATCH 2/2] RM-6786 another fix --- .../model/rma/aspect/VersionRecordAspect.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VersionRecordAspect.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VersionRecordAspect.java index cc4851a39e..efab5cc2ea 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VersionRecordAspect.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/VersionRecordAspect.java @@ -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);