Changeset 9313

Timestamp:

8 Oct 2012, 09:16:59 (12 years ago)

Author:

Henrik Bettermann

Message:

Also site (global) roles must be unset when removin a user.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/authentication.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/authentication.py

@@ -307 +307 @@
 @grok.subscribe(IUserAccount, grok.IObjectRemovedEvent)
 def handle_account_removed(account, event):
-    """When an account is removed, local roles might have to be deleted.
+    """When an account is removed, local and global roles might
+    have to be deleted.
     """
     local_roles = account.getLocalRoles()
     principal = account.name
+
     for role_id, object_list in local_roles.items():
         for object in object_list:
@@ -316 +318 @@
                 role_manager = IPrincipalRoleManager(object)
             except TypeError:
-                # No role manager, no roles to remove
+                # No Account object, no role manager, no local roles to remove
                 continue
             role_manager.unsetRoleForPrincipal(role_id, principal)
+    role_manager = IPrincipalRoleManager(grok.getSite())
+    roles = account.getSiteRolesForPrincipal()
+    for role_id in roles:
+        role_manager.unsetRoleForPrincipal(role_id, principal)
     return
 
@@ -445 +451 @@
         # Log actions...
         items_changed = ', '.join(changed)
-        grok.getSite().logger.info('%s - %s - User updated: %s'
+        grok.getSite().logger.info('%s - %s - updated: %s'
             % (self.name, row['name'], items_changed))
         return