Changeset 6162 for main/waeup.sirp/trunk/src/waeup/sirp/permissions.py

Timestamp:

20 May 2011, 11:02:42 (13 years ago)

Author:

uli

Message:

Retrieve title from role, not from arbitrary dicts.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/permissions.py (modified) (3 diffs)

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

@@ -109 +109 @@
 
     Objects that want to offer certain local roles, can do so by
-    setting a (preferably class-) attribute to a list of dictionaries.
+    setting a (preferably class-) attribute to a list of role ids.
 
     You can also define different adapters for different contexts to
@@ -122 +122 @@
     def __init__(self, context):
         self.context = context
-        self._roles = getattr(context, 'local_roles', self._roles)
+        role_ids = getattr(context, 'local_roles', self._roles)
+        self._roles = [(name, role) for name, role in getRoles()
+                       if name in role_ids]
         return
 
@@ -130 +132 @@
         to assign each role to).
         """
-        list_of_dict = [dict(name=x, title=self._roles[x]) for x in self._roles.keys()]
-        return list_of_dict
+        return [
+            dict(
+                name=name,
+                title=role.title,
+                description =role.description)
+            for name, role in self._roles]
 
     def roles(self):
         """Return a list of roles assignable to the context object.
         """
-        return self._roles.keys()
+        return [name for name, role in self._roles]