Changeset 6157 for main/waeup.sirp/trunk/src/waeup/sirp/interfaces.py

Timestamp:

20 May 2011, 08:52:48 (13 years ago)

Author:

uli

Message:

Zope roles come with a title attribute. Start making use of it and simplify role lookup in w.s.permissions

File:

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

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

@@ -9 +9 @@
 from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 
-
 class FatalCSVError(Exception):
     """Some row could not be processed.
@@ -24 +23 @@
 class RoleSource(BasicSourceFactory):
     def getValues(self):
+        # late import: in interfaces we should not import local modules
+        from waeup.sirp.permissions import getWAeUPRoleNames
+        return getWAeUPRoleNames()
+
+    def getTitle(self, value):
+        # late import: in interfaces we should not import local modules
         from waeup.sirp.permissions import getRoles
-        return getRoles()
-    def getTitle(self, value):
-        if isinstance(value, basestring):
-            return value.split('.', 2)[1]
+        roles = dict(getRoles())
+        if value in roles.keys():
+            title = roles[value].title
+        if '.' in title:
+            title = title.split('.', 2)[1]
+        return title
 
 class IWAeUPObject(Interface):