From 800d32ba70df9bf8e61328ba41d69c226879c9d4 Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Wed, 15 Mar 2017 12:55:02 +0100
Subject: [PATCH] users: add sorting by last activity to the new users grid.

---
 rhodecode/apps/admin/views/users.py        | 1 -
 rhodecode/templates/admin/users/users.mako | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
index d17bfe69..0521b68b 100644
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -68,7 +68,6 @@ class AdminUsersView(BaseAppView):
         order_by = {
             'first_name': 'name',
             'last_name': 'lastname',
-            'last_activity': ''
         }.get(order_by) or order_by
 
         search_q = request.GET.get('search[value]')
diff --git a/rhodecode/templates/admin/users/users.mako b/rhodecode/templates/admin/users/users.mako
index 7458620f..4dfe0ee0 100644
--- a/rhodecode/templates/admin/users/users.mako
+++ b/rhodecode/templates/admin/users/users.mako
@@ -68,7 +68,7 @@ $(document).ready(function() {
                   "sort": "last_name"}, title: "${_('Last Name')}", className: "td-user" },
          { data: {"_": "last_activity",
                   "sort": "last_activity",
-                  "type": Number}, title: "${_('Last activity')}", className: "td-time", orderable: false },
+                  "type": Number}, title: "${_('Last activity')}", className: "td-time" },
          { data: {"_": "active",
                   "sort": "active"}, title: "${_('Active')}", className: "td-active" },
          { data: {"_": "admin",