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

ALF-2036 : Can't link to a folder due to fodler already containing rules (but it doesn't)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19563 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2010-03-24 19:44:31 +00:00
parent 7f4810c32d
commit 27d6bddcf5
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/rule/LinkRules.java
View File

@@ -29,6 +29,7 @@ import org.alfresco.service.cmr.action.ParameterDefinition;
import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.rule.Rule;
import org.alfresco.service.cmr.rule.RuleService;
/**
@@ -87,8 +88,19 @@ public class LinkRules extends ActionExecuterAbstractBase
NodeRef linkedToNode = ((RuleService)ruleService).getLinkedToRuleNode(actionedUponNodeRef);
if (linkedToNode == null)
{
// Can't link a node if it already has rules
throw new AlfrescoRuntimeException("The current folder has rules and can not be linked to another folder.");
// if the node has no rules we can delete the folder ready to link
List<Rule> rules = ((RuleService)ruleService).getRules(actionedUponNodeRef, false);
if (rules.isEmpty() == false)
{
// Can't link a node if it already has rules
throw new AlfrescoRuntimeException("The current folder has rules and can not be linked to another folder.");
}
else
{
// Delete the rules system folder
NodeRef ruleFolder = ruleService.getSavedRuleFolderAssoc(actionedUponNodeRef).getChildRef();
nodeService.deleteNode(ruleFolder);
}
}
else
{

5
source/java/org/alfresco/repo/rule/RuleLinkTest.java
View File

@@ -232,6 +232,11 @@ public class RuleLinkTest extends BaseSpringTest
try
{
rules = ruleService.getRules(folderTwo);
assertNotNull(rules);
assertFalse(rules.isEmpty());
assertEquals(2, rules.size());
link(folderTwo, folderOne);
fail("Shouldn't be able to link a folder that already has rules that it owns.");
}