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

Bug fix for inherited permissions COW

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10423 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2008-08-19 14:49:48 +00:00
parent dcc9ac128c
commit d405e72db8
5 changed files with 213 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/repo/domain/hibernate/AbstractPermissionsDaoComponentImpl.java
View File

@@ -516,6 +516,7 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
else
{
// TODO: Find inheritance
// ATM this should wire up any previous inheritance that existed
changes = aclDaoComponent.enableInheritance(report.getCreated().getId(), null);
}
List<AclChange> all = new ArrayList<AclChange>(changes.size() + report.getChanges().size());

4
source/java/org/alfresco/repo/domain/hibernate/AclDaoComponentImpl.java
View File

@@ -1489,7 +1489,9 @@ public class AclDaoComponentImpl extends HibernateDaoSupport implements AclDaoCo
getWritable(id, null, null, null, null, false, changes, WriteMode.COPY_ONLY);
}
return mergeInheritedAccessControlList(parent, changes.get(0).getAfter());
List<AclChange> merged = mergeInheritedAccessControlList(parent, changes.get(0).getAfter());
changes.addAll(merged);
return changes;
}
}