Index: /main/waeup.sirp/trunk/src/waeup/sirp/permissions.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/permissions.py	(revision 6161)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/permissions.py	(revision 6162)
@@ -109,5 +109,5 @@
 
     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,5 +122,7 @@
     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,9 +132,13 @@
         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]
Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/department.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/department.py	(revision 6161)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/department.py	(revision 6162)
@@ -15,7 +15,5 @@
     @property       # Make this method read_only and looking like an attr.
     def local_roles(cls):
-        return {
-            'waeup.local.DepartmentOfficer':'Department Officer',
-            }
+        return ['waeup.local.DepartmentOfficer']
 
     # A simple counter for ids.
Index: /main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py	(revision 6161)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py	(revision 6162)
@@ -16,7 +16,5 @@
     @property       # Make this method read_only and looking like an attr.
     def local_roles(cls):
-        return {
-            'waeup.local.DepartmentOfficer':'Department Officer',
-            }
+        return ['waeup.local.DepartmentOfficer']
 
     def __init__(self,
