Changeset 7658 for main/waeup.sirp/trunk/src/waeup/sirp/authentication.py

Timestamp:

16 Feb 2012, 15:29:13 (13 years ago)

Author:

Henrik Bettermann

Message:

Do not edit roles if nothing has changed.

Convert role to ASCII string to be in line with the event handler. Otherwise we have a mixture of ASCII and unicode strings.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/authentication.py (modified) (2 diffs)

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

@@ -180 +180 @@
         prm = get_principal_role_manager()
         old_roles = self.getSiteRolesForPrincipal()
+        if sorted(old_roles) == sorted(roles):
+            return
         for role in old_roles:
             # Remove old roles, not to be set now...
@@ -185 +187 @@
                 prm.unsetRoleForPrincipal(role, self.name)
         for role in roles:
-            prm.assignRoleToPrincipal(role, self.name)
+            # Convert role to ASCII string to be in line with the
+            # event handler
+            prm.assignRoleToPrincipal(str(role), self.name)
+        return
 
     roles = property(getSiteRolesForPrincipal, setSiteRolesForPrincipal)