diff options
| -rw-r--r-- | web/app/controller/Root.js | 12 | ||||
| -rw-r--r-- | web/app/store/ServerAttributes.js | 4 | ||||
| -rw-r--r-- | web/app/store/UserAttributes.js | 4 | ||||
| -rw-r--r-- | web/app/view/Main.js | 13 | ||||
| -rw-r--r-- | web/app/view/map/MapController.js | 2 | ||||
| -rw-r--r-- | web/l10n/en.json | 2 |
6 files changed, 21 insertions, 16 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js index 5b0c8817..d85102a7 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -103,7 +103,7 @@ Ext.define('Traccar.controller.Root', { }, loadApp: function () { - var attribution, eventId, main, i; + var attribution, eventId; Ext.getStore('Groups').load(); Ext.getStore('Drivers').load(); Ext.getStore('Geofences').load(); @@ -124,15 +124,7 @@ Ext.define('Traccar.controller.Root', { if (Traccar.app.isMobile()) { Ext.create('widget.mainMobile'); } else { - main = Ext.create('widget.main'); - if (Traccar.app.getAttributePreference('web.disableReport', false).toString() === 'true') { - for (i = 0; i < main.items.length; i++) { - if (main.items.items[i].isXType('reportView')) { - main.items.items[i].hide(); - break; - } - } - } + Ext.create('widget.main'); } eventId = Ext.Object.fromQueryString(window.location.search).eventId; if (eventId) { diff --git a/web/app/store/ServerAttributes.js b/web/app/store/ServerAttributes.js index 7d720836..89a0137b 100644 --- a/web/app/store/ServerAttributes.js +++ b/web/app/store/ServerAttributes.js @@ -48,8 +48,8 @@ Ext.define('Traccar.store.ServerAttributes', { minValue: Traccar.Style.mapDefaultZoom, maxValue: Traccar.Style.mapMaxZoom }, { - key: 'web.disableReport', - name: Strings.attributeWebDisableReport, + key: 'ui.disableReport', + name: Strings.attributeUiDisableReport, valueType: 'boolean' }] }); diff --git a/web/app/store/UserAttributes.js b/web/app/store/UserAttributes.js index 928a9be8..6cf06fbb 100644 --- a/web/app/store/UserAttributes.js +++ b/web/app/store/UserAttributes.js @@ -80,8 +80,8 @@ Ext.define('Traccar.store.UserAttributes', { minValue: Traccar.Style.mapDefaultZoom, maxValue: Traccar.Style.mapMaxZoom }, { - key: 'web.disableReport', - name: Strings.attributeWebDisableReport, + key: 'ui.disableReport', + name: Strings.attributeUiDisableReport, valueType: 'boolean' }] }); diff --git a/web/app/view/Main.js b/web/app/view/Main.js index 3f7cf7c1..f656778e 100644 --- a/web/app/view/Main.js +++ b/web/app/view/Main.js @@ -27,6 +27,19 @@ Ext.define('Traccar.view.Main', { 'Traccar.view.map.Map' ], + initComponent: function () { + var i; + if (Traccar.app.getAttributePreference('ui.disableReport', false).toString() === 'true') { + for (i = 0; i < this.items.length; i++) { + if (this.items[i].xtype === 'reportView') { + this.items[i].hidden = true; + break; + } + } + } + this.callParent(arguments); + }, + layout: 'border', defaults: { diff --git a/web/app/view/map/MapController.js b/web/app/view/map/MapController.js index 39cf5101..f2a561a3 100644 --- a/web/app/view/map/MapController.js +++ b/web/app/view/map/MapController.js @@ -45,7 +45,7 @@ Ext.define('Traccar.view.map.MapController', { init: function () { this.callParent(); this.lookupReference('showReportsButton').setVisible(Traccar.app.isMobile() && - !Traccar.app.getAttributePreference('web.disableReport', false)); + !Traccar.app.getAttributePreference('ui.disableReport', false)); this.lookupReference('showEventsButton').setVisible(Traccar.app.isMobile()); }, diff --git a/web/l10n/en.json b/web/l10n/en.json index 05239354..6476b0d8 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -88,7 +88,7 @@ "attributeMailSmtpAuth": "Mail: SMTP Auth Enable", "attributeMailSmtpUsername": "Mail: SMTP Username", "attributeMailSmtpPassword": "Mail: SMTP Password", - "attributeWebDisableReport": "Web: Disable Report", + "attributeUiDisableReport": "UI: Disable Report", "errorTitle": "Error", "errorGeneral": "Invalid parameters or constraints violation", "errorConnection": "Connection error", |