aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--web/app/store/AllMaintenances.js2
-rw-r--r--web/app/store/CommonUserAttributes.js4
-rw-r--r--web/app/store/Maintenances.js2
-rw-r--r--web/app/view/DeviceMenu.js2
-rw-r--r--web/app/view/DeviceMenuController.js4
-rw-r--r--web/app/view/SettingsMenu.js2
-rw-r--r--web/app/view/SettingsMenuController.js4
-rw-r--r--web/app/view/edit/Groups.js2
-rw-r--r--web/app/view/edit/GroupsController.js4
-rw-r--r--web/app/view/edit/Users.js2
-rw-r--r--web/app/view/edit/UsersController.js4
-rw-r--r--web/l10n/en.json3
12 files changed, 17 insertions, 18 deletions
diff --git a/web/app/store/AllMaintenances.js b/web/app/store/AllMaintenances.js
index 745b5d64..8435ad40 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 0ee9e163..a8e92825 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 43d6ba5b..a7aa4a07 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 e4623b94..06b272ad 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 9355571c..830ea7ec 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 309133c1..0a81d520 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 b838fb40..c8018f66 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 06974201..8b09316c 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 2e62a283..ae96a248 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 2bcaefad..5d9a14f0 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 9d998162..9e810435 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 b885d513..c0e202ce 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",