# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-04-12 20:48:21
# Node ID 38e5e834dd5fafd336b9069d692987c0a0d07a67
# Parent  00bda173fd39b0c92a149717f7c42c91a355b392

admin-users: remove nullslast() as it's generally not mysql compatible.

- fixes #5277

diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -126,9 +126,9 @@ class AdminUsersView(BaseAppView):
 
         sort_col = getattr(User, order_by, None)
         if sort_col and order_dir == 'asc':
-            base_q = base_q.order_by(sort_col.asc().nullslast())
+            base_q = base_q.order_by(sort_col.asc())
         elif sort_col:
-            base_q = base_q.order_by(sort_col.desc().nullslast())
+            base_q = base_q.order_by(sort_col.desc())
 
         base_q = base_q.offset(start).limit(limit)
         users_list = base_q.all()