From 96eba6febca50970f3e7a2a4dedb46b5e065e069 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 30 Jul 2016 12:04:21 +1000
Subject: [PATCH] Roll back uncommon features Refs #2249

---
 .../controllers/users/config_filter.yaml      | 21 ++++---------------
 modules/backend/models/user/columns.yaml      | 19 +++++++++--------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/modules/backend/controllers/users/config_filter.yaml b/modules/backend/controllers/users/config_filter.yaml
index 54f34ac8d..72aa08a8e 100644
--- a/modules/backend/controllers/users/config_filter.yaml
+++ b/modules/backend/controllers/users/config_filter.yaml
@@ -4,27 +4,14 @@
 
 scopes:
 
-    is_activated:
-        label: backend::lang.user.activated
-        type: checkbox
-        conditions: is_activated = 1
-
     is_superuser:
         label: backend::lang.user.superuser
-        type: checkbox
-        conditions: is_superuser = 1
+        type: switch
+        conditions:
+            - is_superuser = 0
+            - is_superuser = 1
 
     login_date:
         label: backend::lang.user.last_login
         type: daterange
         conditions: last_login >= ':after' AND last_login <= ':before'
-
-    created_date:
-        label: backend::lang.user.created_at
-        type: daterange
-        conditions: created_at >= ':after' AND created_at <= ':before'
-
-    updated_date:
-        label: backend::lang.user.updated_at
-        type: daterange
-        conditions: updated_at >= ':after' AND updated_at <= ':before'
diff --git a/modules/backend/models/user/columns.yaml b/modules/backend/models/user/columns.yaml
index 1dbe0a68c..cb9aaf449 100644
--- a/modules/backend/models/user/columns.yaml
+++ b/modules/backend/models/user/columns.yaml
@@ -35,15 +35,6 @@ columns:
         select: name
         sortable: false
 
-    is_activated:
-        label: backend::lang.user.activated
-        invisible: true
-        type: switch
-
-    is_superuser:
-        label: backend::lang.user.superuser
-        type: switch
-
     last_login:
         label: backend::lang.user.last_login
         searchable: true
@@ -60,3 +51,13 @@ columns:
         searchable: true
         invisible: true
         type: datetime
+
+    is_activated:
+        label: backend::lang.user.activated
+        invisible: true
+        type: switch
+
+    is_superuser:
+        label: backend::lang.user.superuser
+        invisible: true
+        type: switch