inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

RM-6869 removing linked record during rejection

Browse Source
This commit is contained in:
Ross Gale
2019-06-03 11:10:16 +01:00
parent 57452c43eb
commit 76c865e41a
4 changed files with 216 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/record/RecordServiceImpl.java
View File

@@ -1497,10 +1497,11 @@ public class RecordServiceImpl extends BaseBehaviourBean
final List<ChildAssociationRef> parentAssocs = nodeService.getParentAssocs(nodeRef);
for (ChildAssociationRef childAssociationRef : parentAssocs)
{
if (!childAssociationRef.isPrimary() && childAssociationRef.getParentRef().equals(originatingLocation))
if (!childAssociationRef.isPrimary() &&
(childAssociationRef.getParentRef().equals(originatingLocation) ||
nodeService.getType(childAssociationRef.getParentRef()).equals(TYPE_RECORD_FOLDER)))
{
nodeService.removeChildAssociation(childAssociationRef);
break;
}
}