inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverse merged 5.2.N (5.2.1)

Browse Source 
136820 mmuller: MNT-15365 Forbid pending rule applying on working copies. Added test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136833 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Martin Muller
2017-05-22 09:24:43 +00:00
parent eeb40852b4
commit d8f90ea98d
2 changed files with 50 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/rule/ruletrigger/RuleTriggerAbstractBase.java
View File

@@ -151,11 +151,6 @@ public abstract class RuleTriggerAbstractBase implements RuleTrigger
{
return;
}
// MNT-15365 No rule applying on working copies
if (nodeService.hasAspect(actionedUponNodeRef, ContentModel.ASPECT_WORKING_COPY))
{
return;
}
// Do not trigger rules for rule and action type nodes
if (ignoreTrigger(actionedUponNodeRef) == false)
{

21
source/test-java/org/alfresco/repo/rule/ruletrigger/RuleTriggerTest.java
View File

@@ -133,27 +133,6 @@ public class RuleTriggerTest extends BaseSpringTest
assertTrue(ruleType.rulesTriggered);
}
// MNT-15365
public void testOnUpdateNodeTriggerOnWorkingCopy()
{
NodeRef nodeRef = this.nodeService.createNode(
this.rootNodeRef,
ContentModel.ASSOC_CHILDREN,
ContentModel.ASSOC_CHILDREN,
ContentModel.TYPE_CONTAINER).getChildRef();
this.nodeService.addAspect(nodeRef, ContentModel.ASPECT_WORKING_COPY, null);
TestRuleType ruleType = createTestRuleType(ON_UPDATE_NODE_TRIGGER);
assertFalse(ruleType.rulesTriggered);
// Try and trigger the type
this.nodeService.setProperty(nodeRef, ContentModel.PROP_NAME, "nameChanged");
// Check to see if the rule type has been triggered. It shouldn't trigger because it is a working copy
assertFalse(ruleType.rulesTriggered);
}
// public void testOnDeleteNodeTrigger()
// {
// NodeRef nodeRef = this.nodeService.createNode(