# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2020-10-09 07:39:50
# Node ID 0cddd671b37f745127dd14052c68c18c9a5bb99a
# Parent  7cc4ee55d8b820558a7a9e182c94a62998cb0aad

users: autocomplete now sorts by matched username to show best matches first.

diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -42,7 +42,7 @@ from rhodecode.lib.exceptions import (
 from rhodecode.lib.caching_query import FromCache
 from rhodecode.model import BaseModel
 from rhodecode.model.db import (
-    _hash_key, true, false, or_, joinedload, User, UserToPerm,
+    _hash_key, func, true, false, or_, joinedload, User, UserToPerm,
     UserEmailMap, UserIpMap, UserLog)
 from rhodecode.model.meta import Session
 from rhodecode.model.auth_token import AuthTokenModel
@@ -96,7 +96,11 @@ class UserModel(BaseModel):
                     User.username.ilike(ilike_expression)
                 )
             )
+            # sort by len to have top most matches first
+            query = query.order_by(func.length(User.username))\
+                .order_by(User.username)
             query = query.limit(limit)
+
         users = query.all()
 
         _users = [