From db73507fe57ed39a79e8786c655c47f10bb20236 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Sat, 19 Nov 2016 14:21:52 +0500
Subject: Add disabled and expirationTime columns

---
 web/app/view/Users.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/web/app/view/Users.js b/web/app/view/Users.js
index f4b2733..ba594c4 100644
--- a/web/app/view/Users.js
+++ b/web/app/view/Users.js
@@ -81,6 +81,20 @@ Ext.define('Traccar.view.Users', {
         }, {
             text: Strings.userAdmin,
             dataIndex: 'admin'
+        }, {
+            text: Strings.userDisabled,
+            dataIndex: 'disabled'
+        }, {
+            text: Strings.userExpirationTime,
+            dataIndex: 'expirationTime',
+            hidden: true,
+            renderer: function (value) {
+                if (Traccar.app.getPreference('twelveHourFormat', false)) {
+                    return Ext.Date.format(value, Traccar.Style.dateTimeFormat12);
+                } else {
+                    return Ext.Date.format(value, Traccar.Style.dateTimeFormat24);
+                }
+            }
         }]
     }
 });
-- 
cgit v1.2.3


From 8c64bc43d6ee686a6e297aa876b659ac0a6c4775 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Sun, 20 Nov 2016 08:36:25 +0500
Subject: Use default renderer

---
 web/app/view/Users.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/web/app/view/Users.js b/web/app/view/Users.js
index ba594c4..4259c4c 100644
--- a/web/app/view/Users.js
+++ b/web/app/view/Users.js
@@ -88,13 +88,7 @@ Ext.define('Traccar.view.Users', {
             text: Strings.userExpirationTime,
             dataIndex: 'expirationTime',
             hidden: true,
-            renderer: function (value) {
-                if (Traccar.app.getPreference('twelveHourFormat', false)) {
-                    return Ext.Date.format(value, Traccar.Style.dateTimeFormat12);
-                } else {
-                    return Ext.Date.format(value, Traccar.Style.dateTimeFormat24);
-                }
-            }
+            renderer: Traccar.AttributeFormatter.getFormatter('expirationTime')
         }]
     }
 });
-- 
cgit v1.2.3