aboutsummaryrefslogtreecommitdiff
path: root/web/app
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-08-09 12:10:23 +0500
committerAbyss777 <abyss@fox5.ru>2017-08-09 12:10:23 +0500
commite7aaac6c970520728bbc0d431498ffac9bb98ad7 (patch)
tree5c775834a432ac7923bc4c8e76035a733086cbc5 /web/app
parent36ac724810ff77ec4070ed8f20ba7336204e384c (diff)
downloadetbsa-traccar-web-e7aaac6c970520728bbc0d431498ffac9bb98ad7.tar.gz
etbsa-traccar-web-e7aaac6c970520728bbc0d431498ffac9bb98ad7.tar.bz2
etbsa-traccar-web-e7aaac6c970520728bbc0d431498ffac9bb98ad7.zip
Move hide logic to Main and rename attribute
Diffstat (limited to 'web/app')
-rw-r--r--web/app/controller/Root.js12
-rw-r--r--web/app/store/ServerAttributes.js4
-rw-r--r--web/app/store/UserAttributes.js4
-rw-r--r--web/app/view/Main.js13
-rw-r--r--web/app/view/map/MapController.js2
5 files changed, 20 insertions, 15 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index 5b0c881..d85102a 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 7d72083..89a0137 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 928a9be..6cf06fb 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 3f7cf7c..f656778 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 39cf510..f2a561a 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());
},