aboutsummaryrefslogtreecommitdiff
path: root/web/app
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-11-20 20:05:51 +1300
committerGitHub <noreply@github.com>2016-11-20 20:05:51 +1300
commit8e02928c79f84fbf37c9df51875c63af410166ac (patch)
tree70287a5225ca7afc7a5ec85ffc723c868dfb6223 /web/app
parentd8e0a38c6626b48f27ad9fc92afb6a548bdaa52a (diff)
parent8c64bc43d6ee686a6e297aa876b659ac0a6c4775 (diff)
downloadetbsa-traccar-web-8e02928c79f84fbf37c9df51875c63af410166ac.tar.gz
etbsa-traccar-web-8e02928c79f84fbf37c9df51875c63af410166ac.tar.bz2
etbsa-traccar-web-8e02928c79f84fbf37c9df51875c63af410166ac.zip
Merge pull request #326 from Abyss777/add_user_columns
Add disabled and expirationTime columns
Diffstat (limited to 'web/app')
-rw-r--r--web/app/view/Users.js8
1 files changed, 8 insertions, 0 deletions
diff --git a/web/app/view/Users.js b/web/app/view/Users.js
index f4b2733..4259c4c 100644
--- a/web/app/view/Users.js
+++ b/web/app/view/Users.js
@@ -81,6 +81,14 @@ Ext.define('Traccar.view.Users', {
}, {
text: Strings.userAdmin,
dataIndex: 'admin'
+ }, {
+ text: Strings.userDisabled,
+ dataIndex: 'disabled'
+ }, {
+ text: Strings.userExpirationTime,
+ dataIndex: 'expirationTime',
+ hidden: true,
+ renderer: Traccar.AttributeFormatter.getFormatter('expirationTime')
}]
}
});