# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2016-05-04 01:18:25
# Node ID 98c3d9515cada54349ee343ab24ee7e1680aeb6e
# Parent  a98e489e52c99c53e2027d70e0b4b2847b6de412

users: sort auto complete users by name instead of using random database order

diff --git a/kallithea/model/repo.py b/kallithea/model/repo.py
--- a/kallithea/model/repo.py
+++ b/kallithea/model/repo.py
@@ -132,7 +132,10 @@ class RepoModel(BaseModel):
         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 @@ class RepoModel(BaseModel):
     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',