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-6926 Don't trigger onUpdateProperties policy when a frozen node is added to another hold

Browse Source
This commit is contained in:
cagache
2019-08-20 14:56:46 +03:00
parent a142a79b45
commit b9039afde2
2 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -587,6 +587,8 @@ public class HoldServiceImpl extends ServiceBaseImpl
addFrozenAspect(nodeRef, props); addFrozenAspect(nodeRef, props);
// Link the record to the hold // Link the record to the hold
//set in transaction cache in order not to trigger update policy when adding the association
transactionalResourceHelper.getSet("frozen").add(nodeRef);
nodeService.addChild(hold, nodeRef, ASSOC_FROZEN_RECORDS, ASSOC_FROZEN_RECORDS); nodeService.addChild(hold, nodeRef, ASSOC_FROZEN_RECORDS, ASSOC_FROZEN_RECORDS);
// audit item being added to the hold // audit item being added to the hold

36
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/integration/hold/AddActiveContentToHoldTest.java
View File

@@ -245,4 +245,40 @@ public class AddActiveContentToHoldTest extends BaseRMTestCase
} }
}); });
} }
/**
* Given active content on hold
* When I try to add content to another hold
* And I have file permission on the other hold
* And I have the appropriate capability to add to hold
* Then the active content is contained within both holds
* And the active content remains frozen
*/
public void testAddDocumentToAnotherHold()
{
doBehaviourDrivenTest(new BehaviourDrivenTest()
{
private NodeRef hold;
private NodeRef hold2;
public void given()
{
hold = holdService.createHold(filePlan, GUID.generate(), GUID.generate(), GUID.generate());
hold2 = holdService.createHold(filePlan, GUID.generate(), GUID.generate(), GUID.generate());
holdService.addToHold(hold, dmDocument);
}
public void when()
{
holdService.addToHold(hold2, dmDocument);
}
public void then()
{
assertTrue(freezeService.isFrozen(dmDocument));
assertTrue(holdService.heldBy(dmDocument, true).contains(hold));
assertTrue(holdService.heldBy(dmDocument, true).contains(hold2));
}
});
}
} }