diff --git a/ceod/model/Group.py b/ceod/model/Group.py index 92e1217..3493ce3 100644 --- a/ceod/model/Group.py +++ b/ceod/model/Group.py @@ -64,7 +64,6 @@ class Group: # to_dict() is usually called for display purposes, so get some more # information to display data['members'] = self.ldap_srv.get_display_info_for_users(self.members) - data['members'].sort(key=lambda member: member['uid']) return data def add_to_ldap(self): diff --git a/ceod/model/LDAPService.py b/ceod/model/LDAPService.py index a569991..1224c8c 100644 --- a/ceod/model/LDAPService.py +++ b/ceod/model/LDAPService.py @@ -112,7 +112,7 @@ class LDAPService: filter = '(|' + ''.join([f'(uid={uid})' for uid in usernames]) + ')' attributes = ['uid', 'cn', 'program'] conn.search(self.ldap_users_base, filter, attributes=attributes) - return [ + entries = [ { 'uid': entry.uid.value, 'cn': entry.cn.value, @@ -120,6 +120,8 @@ class LDAPService: } for entry in conn.entries ] + entries.sort(key=lambda member: member['uid']) + return entries def get_users_with_positions(self) -> List[IUser]: conn = self._get_ldap_conn()