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

Merged V2.9 to HEAD

Browse Source 
9848: Merged V2.2 to V2.9
      9610: Fixed ETWOTWO-548
   10232: Merged V2.2 to V2.9
      10231: Merged V2.1 to V2.2
         10229: Merged V2.1-A to V2.1
              10227: https://issues.alfresco.com/jira/browse/ADB-106
   10530: Merged V2.2 to V2.9
      9847: Applied patch for ETWOTWO-542 (supplied by Peter Monks)
      9897: Fix for ETWOTWO-302: Alphabetise advanced workflow names
      9901: Fixed ETWOTWO-426: V2.2 upgrade problems with MySQL 5.0.51
      9902: Fix for ETWOTWO-438: Versionable aspect and add-content permissions
      9905: Fix ETWOTWO-560
      9912: Increased test wait iterations from 10 (10s) to 100 (100s).
      9919: Part fix for ACT-3574: Added close for schema bootstrap connection


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-09-01 13:26:52 +00:00
parent 4c860ea167
commit 15fcd07997
13 changed files with 720 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/java/org/alfresco/repo/rule/RuleServiceImpl.java
View File

@@ -355,7 +355,12 @@ public class RuleServiceImpl implements RuleService, RuntimeRuleService
{
List<Rule> rules = new ArrayList<Rule>();
if (this.runtimeNodeService.exists(nodeRef) == true && checkNodeType(nodeRef) == true)
// Extra check of CONSUMER permission was added to rule selection,
// to prevent Access Denied Exception due to the bug:
// https://issues.alfresco.com/browse/ETWOTWO-438
if (this.runtimeNodeService.exists(nodeRef) == true && checkNodeType(nodeRef) == true &&
permissionService.hasPermission(nodeRef, PermissionService.CONSUMER) == AccessStatus.ALLOWED)
{
if (includeInherited == true && this.runtimeNodeService.hasAspect(nodeRef, RuleModel.ASPECT_IGNORE_INHERITED_RULES) == false)
{