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

Fix initialisation of permission model

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4719 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind 2007-01-04 11:13:48 +00:00
parent 5434c78ad8
commit 3449af14b5
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/java/org/alfresco/repo/security/permissions/impl/model/PermissionModel.java
View File

@ -921,6 +921,20 @@ public class PermissionModel implements ModelDAO, InitializingBean
permissionReferenceMap = new HashMap<String, PermissionReference>(); permissionReferenceMap = new HashMap<String, PermissionReference>();
permissionGroupMap = new HashMap<PermissionReference, PermissionGroup>(); permissionGroupMap = new HashMap<PermissionReference, PermissionGroup>();
permissionMap = new HashMap<PermissionReference, Permission>(); permissionMap = new HashMap<PermissionReference, Permission>();
for (PermissionSet ps : permissionSets.values())
{
for (PermissionGroup pg : ps.getPermissionGroups())
{
permissionGroupMap.put(pg, pg);
permissionReferenceMap.put(pg.toString(), pg);
}
for (Permission p : ps.getPermissions())
{
permissionReferenceMap.put(p.toString(), p);
permissionMap.put(p, p);
}
}
for (PermissionSet ps : permissionSets.values()) for (PermissionSet ps : permissionSets.values())
{ {
for (PermissionGroup pg : ps.getPermissionGroups()) for (PermissionGroup pg : ps.getPermissionGroups())
@ -938,8 +952,6 @@ public class PermissionModel implements ModelDAO, InitializingBean
{ {
uniqueMap.put(pg.getName(), getBasePermissionGroup(pg)); uniqueMap.put(pg.getName(), getBasePermissionGroup(pg));
} }
permissionReferenceMap.put(pg.toString(), pg);
permissionGroupMap.put(pg, pg);
} }
for (Permission p : ps.getPermissions()) for (Permission p : ps.getPermissions())
{ {
@ -956,8 +968,6 @@ public class PermissionModel implements ModelDAO, InitializingBean
{ {
uniqueMap.put(p.getName(), p); uniqueMap.put(p.getName(), p);
} }
permissionReferenceMap.put(p.toString(), p);
permissionMap.put(p, p);
} }
} }
// Add all permissions to the unique list // Add all permissions to the unique list