Changeset 8774 for main/waeup.kofa/trunk/src

Timestamp:

22 Jun 2012, 10:40:31 (12 years ago)

Author:

Henrik Bettermann

Message:

Sort user list.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• browser/pages.py (modified) (4 diffs)
• permissions.py (modified) (1 diff)

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

@@ -57 +57 @@
     IPasswordValidator, IContactForm, IKofaUtils, ICSVExporter,
     IChangePassword)
-from waeup.kofa.permissions import get_users_with_local_roles, get_all_roles
+from waeup.kofa.permissions import (
+    get_users_with_local_roles, get_all_roles, get_all_users)
 from waeup.kofa.students.catalog import search as searchstudents
 from waeup.kofa.university.catalog import search
@@ -1535 +1536 @@
 
     def getUsers(self):
-        """Get a list of all users.
-        """
-        for key, val in grok.getSite()['users'].items():
-            url = self.url(val)
-            yield(dict(url=url, name=key, val=val))
+        return get_all_users()
 
     def getUsersWithLocalRoles(self):
@@ -1722 +1719 @@
 
     def getUsers(self):
-        """Get a list of all users.
-        """
-        for key, val in grok.getSite()['users'].items():
-            url = self.url(val)
-            yield(dict(url=url, name=key, val=val))
+        return get_all_users()
 
     def getUsersWithLocalRoles(self):
@@ -1967 +1960 @@
 
     def getUsers(self):
-        """Get a list of all users.
-        """
-        for key, val in grok.getSite()['users'].items():
-            url = self.url(val)
-            yield(dict(url=url, name=key, val=val))
+        return get_all_users()
 
     def getUsersWithLocalRoles(self):

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

@@ -272 +272 @@
         return sorted(list_of_dict, key=lambda x: x['name'])
 
+def get_all_users():
+    """Get a list of dictionaries.
+    """
+    users = sorted(grok.getSite()['users'].items(), key=lambda x: x[1].title)
+    for key, val in users:
+        yield(dict(name=key, val=val))
+
 def get_users_with_local_roles(context):
     """Get a list of dicts representing the local roles set for `context`.