# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2017-03-15 14:03:23
# Node ID 4f9855e2909f7362e4c64f5acebb1ec3c8227935
# Parent  ed2ccabe10c3da024563cec37badc68dab115157

users: properly handle null values when sorting columns in user grid.

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
@@ -121,9 +121,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())
+            base_q = base_q.order_by(sort_col.asc().nullslast())
         elif sort_col:
-            base_q = base_q.order_by(sort_col.desc())
+            base_q = base_q.order_by(sort_col.desc().nullslast())
 
         base_q = base_q.offset(start).limit(limit)
         users_list = base_q.all()