aboutsummaryrefslogtreecommitdiff
path: root/web/app
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-11-17 22:48:33 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-11-17 22:48:33 +1300
commite8850343bdb1e5e6a1c366aeacdff1f91bfa5daf (patch)
tree3c9fc1d45185ef71f08280d67b1b4c9c61552ce7 /web/app
parent469869d4c01cd5385acee0c84faa226775454e79 (diff)
downloadtrackermap-web-e8850343bdb1e5e6a1c366aeacdff1f91bfa5daf.tar.gz
trackermap-web-e8850343bdb1e5e6a1c366aeacdff1f91bfa5daf.tar.bz2
trackermap-web-e8850343bdb1e5e6a1c366aeacdff1f91bfa5daf.zip
Add user expiration and device limit
Diffstat (limited to 'web/app')
-rw-r--r--web/app/Application.js2
-rw-r--r--web/app/model/User.js10
-rw-r--r--web/app/view/UserDialog.js24
-rw-r--r--web/app/view/UserDialogController.js7
4 files changed, 38 insertions, 5 deletions
diff --git a/web/app/Application.js b/web/app/Application.js
index 702a75a9..6f4cb1dd 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -130,7 +130,7 @@ Ext.define('Traccar.Application', {
if (Ext.isString(response)) {
Ext.Msg.alert(Strings.errorTitle, response);
} else if (response.responseText) {
- Ext.Msg.alert(response.responseText);
+ Ext.Msg.alert(Strings.errorTitle, response.responseText);
} else if (response.statusText) {
Ext.Msg.alert(Strings.errorTitle, response.statusText);
} else {
diff --git a/web/app/model/User.js b/web/app/model/User.js
index 56748e45..48912417 100644
--- a/web/app/model/User.js
+++ b/web/app/model/User.js
@@ -62,6 +62,16 @@ Ext.define('Traccar.model.User', {
name: 'coordinateFormat',
type: 'string'
}, {
+ name: 'disabled',
+ type: 'boolean'
+ }, {
+ name: 'expirationTime',
+ type: 'date',
+ dateFormat: 'c'
+ }, {
+ name: 'deviceLimit',
+ type: 'int'
+ }, {
name: 'attributes'
}],
diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js
index 479d66dc..a54a20c6 100644
--- a/web/app/view/UserDialog.js
+++ b/web/app/view/UserDialog.js
@@ -47,14 +47,14 @@ Ext.define('Traccar.view.UserDialog', {
name: 'readonly',
fieldLabel: Strings.serverReadonly,
allowBlank: false,
- disabled: true,
+ hidden: true,
reference: 'readonlyField'
}, {
xtype: 'checkboxfield',
name: 'admin',
fieldLabel: Strings.userAdmin,
allowBlank: false,
- disabled: true,
+ hidden: true,
reference: 'adminField'
}, {
xtype: 'combobox',
@@ -110,6 +110,26 @@ Ext.define('Traccar.view.UserDialog', {
displayField: 'name',
valueField: 'key',
editable: false
+ }, {
+ xtype: 'checkboxfield',
+ name: 'disabled',
+ fieldLabel: Strings.userDisabled,
+ hidden: true,
+ reference: 'disabledField'
+ }, {
+ xtype: 'datefield',
+ name: 'expirationTime',
+ fieldLabel: Strings.userExpirationTime,
+ disabled: true,
+ reference: 'expirationTimeField',
+ startDay: Traccar.Style.weekStartDay,
+ format: Traccar.Style.dateFormat
+ }, {
+ xtype: 'numberfield',
+ name: 'deviceLimit',
+ fieldLabel: Strings.userDeviceLimit,
+ disabled: true,
+ reference: 'deviceLimitField'
}]
},
diff --git a/web/app/view/UserDialogController.js b/web/app/view/UserDialogController.js
index 7c5cebd8..cd0a9512 100644
--- a/web/app/view/UserDialogController.js
+++ b/web/app/view/UserDialogController.js
@@ -21,8 +21,11 @@ Ext.define('Traccar.view.UserDialogController', {
init: function () {
if (Traccar.app.getUser().get('admin')) {
- this.lookupReference('adminField').setDisabled(false);
- this.lookupReference('readonlyField').setDisabled(false);
+ this.lookupReference('adminField').setHidden(false);
+ this.lookupReference('readonlyField').setHidden(false);
+ this.lookupReference('disabledField').setHidden(false);
+ this.lookupReference('expirationTimeField').setDisabled(false);
+ this.lookupReference('deviceLimitField').setDisabled(false);
}
},