Merged V3.2 to HEAD

15220: Fixed ALFCOM-3222: RuleService check for copy doesn't handle permissions
   Removed svn:mergeinfo


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15223 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-07-16 10:45:35 +00:00
parent c7bcfd00a4
commit 25c94b39a6

View File

@@ -983,7 +983,9 @@ public class RuleServiceImpl implements RuleService, RuntimeRuleService
private boolean checkForCopy(Set<ExecutedRuleData> executedRules, NodeRef actionedUponNodeRef, Rule rule) private boolean checkForCopy(Set<ExecutedRuleData> executedRules, NodeRef actionedUponNodeRef, Rule rule)
{ {
boolean result = true; boolean result = true;
if (this.nodeService.exists(actionedUponNodeRef) == true && this.nodeService.hasAspect(actionedUponNodeRef, ContentModel.ASPECT_COPIEDFROM) == true) if (this.nodeService.exists(actionedUponNodeRef)
&& this.permissionService.hasPermission(actionedUponNodeRef, PermissionService.READ).equals(AccessStatus.ALLOWED)
&& this.nodeService.hasAspect(actionedUponNodeRef, ContentModel.ASPECT_COPIEDFROM) == true)
{ {
if (logger.isDebugEnabled() == true) if (logger.isDebugEnabled() == true)
{ {