Mercurial > kallithea
changeset 5888:98c3d9515cad
users: sort auto complete users by name instead of using random database order
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 04 May 2016 01:18:25 +0200 |
| parents | a98e489e52c9 |
| children | 52a10832bbb0 |
| files | kallithea/model/repo.py |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/model/repo.py Wed May 04 01:18:25 2016 +0200 +++ b/kallithea/model/repo.py Wed May 04 01:18:25 2016 +0200 @@ -132,7 +132,10 @@ return Repository.query().filter(Repository.repo_name.in_(repos)) def get_users_js(self): - users = self.sa.query(User).filter(User.active == True).all() + users = self.sa.query(User) \ + .filter(User.active == True) \ + .order_by(User.name, User.lastname) \ + .all() return json.dumps([ { 'id': u.user_id, @@ -147,6 +150,7 @@ def get_user_groups_js(self): user_groups = self.sa.query(UserGroup) \ .filter(UserGroup.users_group_active == True) \ + .order_by(UserGroup.users_group_name) \ .options(subqueryload(UserGroup.members)) \ .all() user_groups = UserGroupList(user_groups, perm_set=['usergroup.read',