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

Merge remote-tracking branch 'origin/feature/MNT-21132_ExtraSecondaryParentForHold' into feature/MNT-21132_IncorrectLinkToFolder

Browse Source
This commit is contained in:
estan
2020-11-09 19:21:30 +02:00
parent 394f4de0b2 8a34a8047f
commit 7df7f83642
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java
View File

@@ -28,6 +28,7 @@
package org.alfresco.module.org_alfresco_module_rm.hold; package org.alfresco.module.org_alfresco_module_rm.hold;
import static org.alfresco.model.ContentModel.ASPECT_LOCKABLE; import static org.alfresco.model.ContentModel.ASPECT_LOCKABLE;
import static org.alfresco.model.ContentModel.ASSOC_CONTAINS;
import static org.alfresco.model.ContentModel.PROP_NAME; import static org.alfresco.model.ContentModel.PROP_NAME;
import java.io.Serializable; import java.io.Serializable;
@@ -312,7 +313,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
if (holdContainer != null) if (holdContainer != null)
{ {
// get the children of the root hold container // get the children of the root hold container
List<ChildAssociationRef> holdsAssocs = nodeService.getChildAssocs(holdContainer, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); List<ChildAssociationRef> holdsAssocs = nodeService.getChildAssocs(holdContainer, ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL);
for (ChildAssociationRef holdAssoc : holdsAssocs) for (ChildAssociationRef holdAssoc : holdsAssocs)
{ {
NodeRef hold = holdAssoc.getChildRef(); NodeRef hold = holdAssoc.getChildRef();
@@ -405,7 +406,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
NodeRef holdContainer = filePlanService.getHoldContainer(filePlan); NodeRef holdContainer = filePlanService.getHoldContainer(filePlan);
// get the hold by name // get the hold by name
NodeRef hold = nodeService.getChildByName(holdContainer, ContentModel.ASSOC_CONTAINS, name); NodeRef hold = nodeService.getChildByName(holdContainer, ASSOC_CONTAINS, name);
if (hold != null && !isHold(hold)) if (hold != null && !isHold(hold))
{ {
throw new AlfrescoRuntimeException("Can not get hold, because the named node reference isn't a hold."); throw new AlfrescoRuntimeException("Can not get hold, because the named node reference isn't a hold.");
@@ -468,7 +469,7 @@ public class HoldServiceImpl extends ServiceBaseImpl
QName assocName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name); QName assocName = QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, name);
// create hold // create hold
ChildAssociationRef childAssocRef = nodeService.createNode(holdContainer, ContentModel.ASSOC_CONTAINS, assocName, TYPE_HOLD, properties); ChildAssociationRef childAssocRef = nodeService.createNode(holdContainer, ASSOC_CONTAINS, assocName, TYPE_HOLD, properties);
NodeRef holdNodeRef = childAssocRef.getChildRef(); NodeRef holdNodeRef = childAssocRef.getChildRef();
@@ -658,6 +659,9 @@ public class HoldServiceImpl extends ServiceBaseImpl
//set in transaction cache in order not to trigger update policy when adding the association //set in transaction cache in order not to trigger update policy when adding the association
transactionalResourceHelper.getSet("frozen").add(nodeRef); transactionalResourceHelper.getSet("frozen").add(nodeRef);
nodeService.addChild(hold, nodeRef, ASSOC_FROZEN_CONTENT, ASSOC_FROZEN_CONTENT); nodeService.addChild(hold, nodeRef, ASSOC_FROZEN_CONTENT, ASSOC_FROZEN_CONTENT);
// get the documents primary parent assoc
ChildAssociationRef parentAssoc = nodeService.getPrimaryParent(nodeRef);
nodeService.addChild(hold, nodeRef, ASSOC_CONTAINS, parentAssoc.getQName());
// Mark all the folders contents as frozen // Mark all the folders contents as frozen
if (isRecordFolder(nodeRef)) if (isRecordFolder(nodeRef))