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 V3.1 to HEAD

Browse Source 
13218: Partial fix for ETHREEOH-1259 - the null pointer exceptions are gone to be replaced by sensible error messages.
   13220: Merged V3.0 to V3.1
      13219: Build Fix for error in hand merge of r13141 from V2.2 to V3.0
   13226: Clearer debugging of exceptions during NodeService cleanup
   13228: ETHREEOH-1250
   13229: Fix for ETHREEOH-1184: Share webscript configuration does not support international chars as values
   13235: Add support to exclude admin and guest from person permission fix ups. Tidy up for ETHREEOH-1239
   13239: Build Fix
   13243: ETHREEOH-1308: Update AMPs to indicate unsupported status
   13247: Build fix - do not delete admin :-)
   13248: Fix build
   13254: Fix for ETHREEOH-1351: Schemas containing an enumeration with an empty string ...
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r13219
      Merged /alfresco/BRANCHES/V3.1:r13218-13220,13224,13226-13229,13231-13232,13234-13237,13239,13241,13243-13248,13250,13252-13254


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-12 20:51:43 +00:00
parent 07114a1ed2
commit ae58306cf9
6 changed files with 78 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/security/person/CheckAndFixPersonPermissionsBootstrapBean.java
View File

@@ -56,6 +56,8 @@ public class CheckAndFixPersonPermissionsBootstrapBean extends AbstractLifecycle
private PermissionsManager permissionsManager;
private Set<String> excludedUsers;
public void setNodeService(NodeService nodeService)
{
this.nodeService = nodeService;
@@ -75,6 +77,11 @@ public class CheckAndFixPersonPermissionsBootstrapBean extends AbstractLifecycle
{
this.permissionsManager = permissionsManager;
}
public void setExcludedUsers(Set<String> excludedUsers)
{
this.excludedUsers = excludedUsers;
}
@Override
protected void onBootstrap(ApplicationEvent event)
@@ -96,6 +103,10 @@ public class CheckAndFixPersonPermissionsBootstrapBean extends AbstractLifecycle
for (NodeRef person : people)
{
String uid = DefaultTypeConverter.INSTANCE.convert(String.class, nodeService.getProperty(person, ContentModel.PROP_USERNAME));
if((excludedUsers != null) && excludedUsers.contains(uid))
{
continue;
}
if(!permissionsManager.validatePermissions(person, uid, uid))
{
permissionsManager.setPermissions(person, uid, uid);