From 4de571d91e36769be5ccc428ba698e88692eac08 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Wed, 15 Mar 2017 15:03:23 +0100 Subject: [PATCH] users: properly handle null values when sorting columns in user grid. --- rhodecode/apps/admin/views/users.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py index 0521b68b..eef110a8 100644 --- 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()