From cb4632adeda3a272641b426979bbbac9554c5b0a Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Tue, 20 Jan 2015 21:59:11 +0000 Subject: [PATCH] RM-1825 (Can't move/delete in-place record when outbound rule to Hide Record is set) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@93764 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../record/InplaceRecordServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java index e90693e924..16bd7effb9 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/record/InplaceRecordServiceImpl.java @@ -18,6 +18,8 @@ */ package org.alfresco.module.org_alfresco_module_rm.record; +import static org.alfresco.model.ContentModel.ASPECT_PENDING_DELETE; + import java.util.List; import java.util.Set; @@ -96,7 +98,9 @@ public class InplaceRecordServiceImpl extends ServiceBaseImpl implements Inplace List parentAssocs = nodeService.getParentAssocs(nodeRef); for (ChildAssociationRef childAssociationRef : parentAssocs) { - if (!childAssociationRef.isPrimary() && childAssociationRef.getParentRef().equals(originatingLocation)) + if (!childAssociationRef.isPrimary() && + childAssociationRef.getParentRef().equals(originatingLocation) && + !nodeService.hasAspect(childAssociationRef.getChildRef(), ASPECT_PENDING_DELETE)) { nodeService.removeChildAssociation(childAssociationRef); break;