aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/edit
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-08-11 17:41:42 +0500
committerAbyss777 <abyss@fox5.ru>2017-08-11 17:41:42 +0500
commitc52d923d60815fcc6c1e9592edbcd578caf1147c (patch)
tree8f4499af1fcece46f80ae0611b577c81e5114f8a /web/app/view/edit
parenta2b7e07df1cc4548e27c51e1545cf210b0ef0ab7 (diff)
downloadetbsa-traccar-web-c52d923d60815fcc6c1e9592edbcd578caf1147c.tar.gz
etbsa-traccar-web-c52d923d60815fcc6c1e9592edbcd578caf1147c.tar.bz2
etbsa-traccar-web-c52d923d60815fcc6c1e9592edbcd578caf1147c.zip
Implement disable Drivers and Computed Attributes separately
Diffstat (limited to 'web/app/view/edit')
-rw-r--r--web/app/view/edit/DevicesController.js5
-rw-r--r--web/app/view/edit/GroupsController.js5
-rw-r--r--web/app/view/edit/UsersController.js4
3 files changed, 12 insertions, 2 deletions
diff --git a/web/app/view/edit/DevicesController.js b/web/app/view/edit/DevicesController.js
index b98a8d4..59a10bb 100644
--- a/web/app/view/edit/DevicesController.js
+++ b/web/app/view/edit/DevicesController.js
@@ -61,7 +61,10 @@ Ext.define('Traccar.view.edit.DevicesController', {
deviceReadonly = Traccar.app.getPreference('deviceReadonly', false) && !Traccar.app.getUser().get('admin');
readonly = Traccar.app.getPreference('readonly', false) && !Traccar.app.getUser().get('admin');
this.lookupReference('toolbarAddButton').setDisabled(readonly || deviceReadonly);
- this.lookupReference('toolbarDriversButton').setHidden(Traccar.app.isVehicleFeaturesDisabled());
+ this.lookupReference('toolbarDriversButton').setHidden(Traccar.app.isVehicleFeaturesDisabled() ||
+ Traccar.app.getBooleanAttributePreference('ui.disableDrivers'));
+ this.lookupReference('toolbarAttributesButton').setHidden(
+ Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes'));
setInterval(function () {
self.getView().getView().refresh();
diff --git a/web/app/view/edit/GroupsController.js b/web/app/view/edit/GroupsController.js
index 941f5f1..f1da19c 100644
--- a/web/app/view/edit/GroupsController.js
+++ b/web/app/view/edit/GroupsController.js
@@ -33,7 +33,10 @@ Ext.define('Traccar.view.edit.GroupsController', {
removeTitle: Strings.groupDialog,
init: function () {
- this.lookupReference('toolbarDriversButton').setHidden(Traccar.app.isVehicleFeaturesDisabled());
+ this.lookupReference('toolbarDriversButton').setHidden(Traccar.app.isVehicleFeaturesDisabled() ||
+ Traccar.app.getBooleanAttributePreference('ui.disableDrivers'));
+ this.lookupReference('toolbarAttributesButton').setHidden(
+ Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes'));
},
onGeofencesClick: function () {
diff --git a/web/app/view/edit/UsersController.js b/web/app/view/edit/UsersController.js
index fb7a36e..1e7238a 100644
--- a/web/app/view/edit/UsersController.js
+++ b/web/app/view/edit/UsersController.js
@@ -41,6 +41,10 @@ Ext.define('Traccar.view.edit.UsersController', {
init: function () {
Ext.getStore('Users').load();
this.lookupReference('userUsersButton').setHidden(!Traccar.app.getUser().get('admin'));
+ this.lookupReference('userDriversButton').setHidden(Traccar.app.isVehicleFeaturesDisabled() ||
+ Traccar.app.getBooleanAttributePreference('ui.disableDrivers'));
+ this.lookupReference('userAttributesButton').setHidden(
+ Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes'));
},
onEditClick: function () {