Changeset 6163 for main

Timestamp:

20 May 2011, 12:01:50 (14 years ago)

Author:

uli

Message:

Move get_users_with_local_roles and shorten it.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• browser/pages.py (modified) (5 diffs)
• permissions.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -36 +36 @@
     IWAeUPXMLImporter, IWAeUPXMLExporter, IBatchProcessor,
     ILocalRolesAssignable)
+from waeup.sirp.permissions import get_users_with_local_roles
 from waeup.sirp.university.catalog import search
 from waeup.sirp.university.vocabularies import course_levels
@@ -51 +52 @@
     view.redirect(view.url(view.context, u'@@manage')+'#tab-%s' % tab)
     return
-
-def get_users_with_local_roles(view):
-    role_manager = IPrincipalRoleManager(view.context)
-    role_map = IPrincipalRoleMap(view.context)
-    for item in role_map.getPrincipalsAndRoles():
-        local_role = item[0]
-        user_name = item[1]
-        setting = item[2]
-        user = grok.getSite()['users'].get(user_name,None)
-        roles_dict = view.context.local_roles
-        local_role_title = roles_dict[local_role]
-        if user:
-            yield(dict(user_name=user_name, user_title=user.description,
-                local_role=local_role, local_role_title=local_role_title,
-                setting=setting))
-        else:
-            yield(dict(user_name=user_name, user_title=user_name,
-                local_role=local_role, local_role_title=local_role_title,
-                setting=setting))
 
 def del_local_roles(view, tab, **data):
@@ -1027 +1009 @@
 
     def getUsersWithLocalRoles(self):
-        return get_users_with_local_roles(self)
+        return get_users_with_local_roles(self.context)
 
     # ToDo: Show warning message before deletion
@@ -1190 +1172 @@
         super(DepartmentManageFormPage, self).update()
         return
-        
+
     def getLocalRoles(self):
         roles = ILocalRolesAssignable(self.context)
@@ -1201 +1183 @@
             url = self.url(val)
             yield(dict(url=url, name=key, val=val))
-            
+
     def getUsersWithLocalRoles(self):
-        return get_users_with_local_roles(self)
+        return get_users_with_local_roles(self.context)
 
     @grok.action('Save')

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

@@ -2 +2 @@
 from zope.component import getUtilitiesFor
 from zope.interface import Interface
-from zope.securitypolicy.interfaces import IRole
+from zope.securitypolicy.interfaces import IRole, IPrincipalRoleMap
 from waeup.sirp.interfaces import ILocalRolesAssignable
 
@@ -136 +136 @@
                 name=name,
                 title=role.title,
-                description =role.description)
+                description=role.description)
             for name, role in self._roles]
 
@@ -143 +143 @@
         """
         return [name for name, role in self._roles]
+
+def get_users_with_local_roles(context):
+    """Get a list of dicts representing the local roles set for `context`.
+
+    Each dict returns `user_name`, `user_title`, `local_role`,
+    `local_role_title`, and `setting` for each entry in the local
+    roles map of the `context` object.
+    """
+    role_map = IPrincipalRoleMap(context)
+    for local_role, user_name, setting in role_map.getPrincipalsAndRoles():
+        user = grok.getSite()['users'].get(user_name,None)
+        user_title = getattr(user, 'description', user_name)
+        local_role_title = getRoles()[local_role].title
+        yield dict(user_name = user_name,
+                   user_title = user_title,
+                   local_role = local_role,
+                   local_role_title = local_role_title,
+                   setting = setting)