Changeset 6160

Timestamp:

20 May 2011, 09:38:41 (13 years ago)

Author:

Henrik Bettermann

Message:

Change class attribute from list of dicts to dict. This makes configuration less error-prone.

Location:

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

Files:

• permissions.py (modified) (1 diff)
• university/department.py (modified) (1 diff)
• university/faculty.py (modified) (1 diff)

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

@@ -130 +130 @@
         to assign each role to).
         """
-        return self._roles
+        list_of_dict = [dict(name=x, title=self._roles[x]) for x in self._roles.keys()]
+        return list_of_dict
 
     def roles(self):
         """Return a list of roles assignable to the context object.
         """
-        return [x['name'] for x in self._roles]
+        return self._roles.keys()

main/waeup.sirp/trunk/src/waeup/sirp/university/department.py

@@ -15 +15 @@
     @property       # Make this method read_only and looking like an attr.
     def local_roles(cls):
-        return [
-            {'name':'waeup.local.DepartmentOfficer',
-             'title':'Department Officer'},
-            ]
+        return {
+            'waeup.local.DepartmentOfficer':'Department Officer',
+            }
 
     # A simple counter for ids.

main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py

@@ -16 +16 @@
     @property       # Make this method read_only and looking like an attr.
     def local_roles(cls):
-        return [
-            {'name':'waeup.local.DepartmentOfficer',
-             'title':'Department Officer'},
-            ]
+        return {
+            'waeup.local.DepartmentOfficer':'Department Officer',
+            }
 
     def __init__(self,