services/sqlstore: Order results in UserSearch by username/email (#23328)

* services/sqlstore: Order results in UserSearch by username/email * Add index (login,email) on user table
2020-04-03 19:15:10 +02:00
parent b86789c66b
commit 0fd6edab64
3 changed files with 5 additions and 3 deletions
@@ -454,7 +454,7 @@ func SearchUsers(query *models.SearchUsersQuery) error {
 	offset := query.Limit * (query.Page - 1)
 	sess.Limit(query.Limit, offset)
 	sess.Cols("u.id", "u.email", "u.name", "u.login", "u.is_admin", "u.is_disabled", "u.last_seen_at", "user_auth.auth_module")
-	sess.OrderBy("u.id")
+	sess.Asc("u.login", "u.email")
 	if err := sess.Find(&query.Result.Users); err != nil {
 		return err
 	}