From d15fa5e2316b62884e48830c6c0bacb54ed1cd52 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 12 Oct 2018 14:55:56 +1300 Subject: Restrict access to computed attributes (AC-2018-10-8-1) --- web/app/view/SettingsMenuController.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'web/app/view/SettingsMenuController.js') diff --git a/web/app/view/SettingsMenuController.js b/web/app/view/SettingsMenuController.js index 37e0634..fdc1e53 100644 --- a/web/app/view/SettingsMenuController.js +++ b/web/app/view/SettingsMenuController.js @@ -45,6 +45,8 @@ Ext.define('Traccar.view.SettingsMenuController', { if (admin) { this.lookupReference('settingsServerButton').setHidden(false); this.lookupReference('settingsStatisticsButton').setHidden(false); + this.lookupReference('settingsComputedAttributesButton').setHidden( + Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes')); } if (admin || manager) { this.lookupReference('settingsUsersButton').setHidden(false); @@ -62,10 +64,6 @@ Ext.define('Traccar.view.SettingsMenuController', { this.lookupReference('settingsMaintenancesButton').setHidden( Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenances')); } - if (admin || !deviceReadonly && !readonly) { - this.lookupReference('settingsComputedAttributesButton').setHidden( - Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes')); - } }, onUserClick: function () { -- cgit v1.2.3 From 2273341a2d22ac86dbc2c23481c06fe7d2c91a0f Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 12 Oct 2018 15:04:16 +1300 Subject: Remove unused variable --- web/app/view/SettingsMenuController.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'web/app/view/SettingsMenuController.js') diff --git a/web/app/view/SettingsMenuController.js b/web/app/view/SettingsMenuController.js index fdc1e53..b838fb4 100644 --- a/web/app/view/SettingsMenuController.js +++ b/web/app/view/SettingsMenuController.js @@ -37,11 +37,10 @@ Ext.define('Traccar.view.SettingsMenuController', { ], init: function () { - var admin, manager, readonly, deviceReadonly; + var admin, manager, readonly; admin = Traccar.app.getUser().get('administrator'); manager = Traccar.app.getUser().get('userLimit') !== 0; readonly = Traccar.app.getPreference('readonly', false); - deviceReadonly = Traccar.app.getUser().get('deviceReadonly'); if (admin) { this.lookupReference('settingsServerButton').setHidden(false); this.lookupReference('settingsStatisticsButton').setHidden(false); -- cgit v1.2.3 From 62db06b85439b21a7851016f3e9c17f0abfe7185 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 12 Nov 2018 15:18:13 +1300 Subject: Rename maintenances to maintenance --- web/app/store/AllMaintenances.js | 2 +- web/app/store/CommonUserAttributes.js | 4 ++-- web/app/store/Maintenances.js | 2 +- web/app/view/DeviceMenu.js | 2 +- web/app/view/DeviceMenuController.js | 4 ++-- web/app/view/SettingsMenu.js | 2 +- web/app/view/SettingsMenuController.js | 4 ++-- web/app/view/edit/Groups.js | 2 +- web/app/view/edit/GroupsController.js | 4 ++-- web/app/view/edit/Users.js | 2 +- web/app/view/edit/UsersController.js | 4 ++-- web/l10n/en.json | 3 +-- 12 files changed, 17 insertions(+), 18 deletions(-) (limited to 'web/app/view/SettingsMenuController.js') diff --git a/web/app/store/AllMaintenances.js b/web/app/store/AllMaintenances.js index 745b5d6..8435ad4 100644 --- a/web/app/store/AllMaintenances.js +++ b/web/app/store/AllMaintenances.js @@ -22,7 +22,7 @@ Ext.define('Traccar.store.AllMaintenances', { proxy: { type: 'rest', - url: 'api/maintenances', + url: 'api/maintenance', extraParams: { all: true } diff --git a/web/app/store/CommonUserAttributes.js b/web/app/store/CommonUserAttributes.js index 0ee9e16..a8e9282 100644 --- a/web/app/store/CommonUserAttributes.js +++ b/web/app/store/CommonUserAttributes.js @@ -63,8 +63,8 @@ Ext.define('Traccar.store.CommonUserAttributes', { name: Strings.attributeUiDisableCalendars, valueType: 'boolean' }, { - key: 'ui.disableMaintenances', - name: Strings.attributeUiDisableMaintenances, + key: 'ui.disableMaintenance', + name: Strings.attributeUiDisableMaintenance, valueType: 'boolean' }, { key: 'ui.hidePositionAttributes', diff --git a/web/app/store/Maintenances.js b/web/app/store/Maintenances.js index 43d6ba5..a7aa4a0 100644 --- a/web/app/store/Maintenances.js +++ b/web/app/store/Maintenances.js @@ -22,7 +22,7 @@ Ext.define('Traccar.store.Maintenances', { proxy: { type: 'rest', - url: 'api/maintenances', + url: 'api/maintenance', writer: { writeAllFields: true } diff --git a/web/app/view/DeviceMenu.js b/web/app/view/DeviceMenu.js index e4623b9..06b272a 100644 --- a/web/app/view/DeviceMenu.js +++ b/web/app/view/DeviceMenu.js @@ -57,7 +57,7 @@ Ext.define('Traccar.view.DeviceMenu', { handler: 'onCommandsClick', reference: 'menuCommandsButton' }, { - text: Strings.sharedMaintenances, + text: Strings.sharedMaintenance, glyph: 'xf0ad@FontAwesome', handler: 'onMaintenancesClick', reference: 'menuMaintenancesButton' diff --git a/web/app/view/DeviceMenuController.js b/web/app/view/DeviceMenuController.js index 9355571..830ea7e 100644 --- a/web/app/view/DeviceMenuController.js +++ b/web/app/view/DeviceMenuController.js @@ -40,7 +40,7 @@ Ext.define('Traccar.view.DeviceMenuController', { this.lookupReference('menuDeviceAccumulatorsButton').setHidden( !Traccar.app.getUser().get('administrator') && Traccar.app.getUser().get('userLimit') === 0 || Traccar.app.getVehicleFeaturesDisabled()); this.lookupReference('menuMaintenancesButton').setHidden( - Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenances')); + Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenance')); }, onGeofencesClick: function () { @@ -110,7 +110,7 @@ Ext.define('Traccar.view.DeviceMenuController', { onMaintenancesClick: function () { Ext.create('Traccar.view.BaseWindow', { - title: Strings.sharedMaintenances, + title: Strings.sharedMaintenance, items: { xtype: 'linkMaintenancesView', baseObjectName: 'deviceId', diff --git a/web/app/view/SettingsMenu.js b/web/app/view/SettingsMenu.js index 309133c..0a81d52 100644 --- a/web/app/view/SettingsMenu.js +++ b/web/app/view/SettingsMenu.js @@ -98,7 +98,7 @@ Ext.define('Traccar.view.SettingsMenu', { reference: 'settingsCommandsButton' }, { hidden: true, - text: Strings.sharedMaintenances, + text: Strings.sharedMaintenance, glyph: 'xf0ad@FontAwesome', handler: 'onMaintenancesClick', reference: 'settingsMaintenancesButton' diff --git a/web/app/view/SettingsMenuController.js b/web/app/view/SettingsMenuController.js index b838fb4..c8018f6 100644 --- a/web/app/view/SettingsMenuController.js +++ b/web/app/view/SettingsMenuController.js @@ -61,7 +61,7 @@ Ext.define('Traccar.view.SettingsMenuController', { Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableDrivers')); this.lookupReference('settingsCommandsButton').setHidden(Traccar.app.getPreference('limitCommands', false)); this.lookupReference('settingsMaintenancesButton').setHidden( - Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenances')); + Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenance')); } }, @@ -163,7 +163,7 @@ Ext.define('Traccar.view.SettingsMenuController', { onMaintenancesClick: function () { Ext.create('Traccar.view.BaseWindow', { - title: Strings.sharedMaintenances, + title: Strings.sharedMaintenance, items: { xtype: 'maintenancesView' } diff --git a/web/app/view/edit/Groups.js b/web/app/view/edit/Groups.js index 0697420..8b09316 100644 --- a/web/app/view/edit/Groups.js +++ b/web/app/view/edit/Groups.js @@ -76,7 +76,7 @@ Ext.define('Traccar.view.edit.Groups', { handler: 'onMaintenancesClick', reference: 'toolbarMaintenancesButton', glyph: 'xf0ad@FontAwesome', - tooltip: Strings.sharedMaintenances, + tooltip: Strings.sharedMaintenance, tooltipType: 'title' }] }, diff --git a/web/app/view/edit/GroupsController.js b/web/app/view/edit/GroupsController.js index 2e62a28..ae96a24 100644 --- a/web/app/view/edit/GroupsController.js +++ b/web/app/view/edit/GroupsController.js @@ -41,7 +41,7 @@ Ext.define('Traccar.view.edit.GroupsController', { Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes')); this.lookupReference('toolbarCommandsButton').setHidden(Traccar.app.getPreference('limitCommands', false)); this.lookupReference('toolbarMaintenancesButton').setHidden( - Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenances')); + Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenance')); }, onGeofencesClick: function () { @@ -117,7 +117,7 @@ Ext.define('Traccar.view.edit.GroupsController', { onMaintenancesClick: function () { var group = this.getView().getSelectionModel().getSelection()[0]; Ext.create('Traccar.view.BaseWindow', { - title: Strings.sharedMaintenances, + title: Strings.sharedMaintenance, items: { xtype: 'linkMaintenancesView', baseObjectName: 'groupId', diff --git a/web/app/view/edit/Users.js b/web/app/view/edit/Users.js index 2bcaefa..5d9a14f 100644 --- a/web/app/view/edit/Users.js +++ b/web/app/view/edit/Users.js @@ -101,7 +101,7 @@ Ext.define('Traccar.view.edit.Users', { handler: 'onMaintenancesClick', reference: 'userMaintenancesButton', glyph: 'xf0ad@FontAwesome', - tooltip: Strings.sharedMaintenances, + tooltip: Strings.sharedMaintenance, tooltipType: 'title' }] }, diff --git a/web/app/view/edit/UsersController.js b/web/app/view/edit/UsersController.js index 9d99816..9e81043 100644 --- a/web/app/view/edit/UsersController.js +++ b/web/app/view/edit/UsersController.js @@ -51,7 +51,7 @@ Ext.define('Traccar.view.edit.UsersController', { Traccar.app.getBooleanAttributePreference('ui.disableCalendars')); this.lookupReference('userCommandsButton').setHidden(Traccar.app.getPreference('limitCommands', false)); this.lookupReference('userMaintenancesButton').setHidden( - Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenances')); + Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableMaintenance')); }, onEditClick: function () { @@ -215,7 +215,7 @@ Ext.define('Traccar.view.edit.UsersController', { onMaintenancesClick: function () { var user = this.getView().getSelectionModel().getSelection()[0]; Ext.create('Traccar.view.BaseWindow', { - title: Strings.sharedMaintenances, + title: Strings.sharedMaintenance, items: { xtype: 'linkMaintenancesView', baseObjectName: 'userId', diff --git a/web/l10n/en.json b/web/l10n/en.json index b885d51..c0e202c 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -75,7 +75,6 @@ "sharedShowAddress": "Show Address", "sharedDisabled": "Disabled", "sharedMaintenance": "Maintenance", - "sharedMaintenances": "Maintenances", "sharedDeviceAccumulators": "Accumulators", "sharedAlarms": "Alarms", "attributeSpeedLimit": "Speed Limit", @@ -105,7 +104,7 @@ "attributeUiDisableDrivers": "UI: Disable Drivers", "attributeUiDisableComputedAttributes": "UI: Disable Computed Attributes", "attributeUiDisableCalendars": "UI: Disable Calendars", - "attributeUiDisableMaintenances": "UI: Disable Maintenances", + "attributeUiDisableMaintenance": "UI: Disable Maintenance", "attributeUiHidePositionAttributes": "UI: Hide Position Attributes", "errorTitle": "Error", "errorGeneral": "Invalid parameters or constraints violation", -- cgit v1.2.3