From 72dd6fa3f04a12df346ef3996878092cde407681 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Tue, 30 Aug 2016 14:31:21 +0500 Subject: Used static variable and move creation allEvents item from config to ReportConfigController.init() --- web/app/view/ReportConfigController.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'web/app/view/ReportConfigController.js') diff --git a/web/app/view/ReportConfigController.js b/web/app/view/ReportConfigController.js index 5bd6ae7ef..64acb7403 100644 --- a/web/app/view/ReportConfigController.js +++ b/web/app/view/ReportConfigController.js @@ -21,7 +21,11 @@ Ext.define('Traccar.view.ReportConfigController', { init: function () { var store = this.lookupReference('eventTypeField').getStore(); - if (store.getCount() === 1) { + if (store.getCount() === 0) { + store.add({ + type: Traccar.store.ReportEventTypes.allEvents, + name: Strings.eventAll + }); Ext.create('Traccar.store.AllNotifications').load({ scope: this, callback: function (records, operation, success) { @@ -44,10 +48,10 @@ Ext.define('Traccar.view.ReportConfigController', { this.getView().callingPanel.deviceId = this.lookupReference('deviceField').getValue(); this.getView().callingPanel.groupId = this.lookupReference('groupField').getValue(); eventType = this.lookupReference('eventTypeField').getValue(); - if (eventType.indexOf(Ext.getStore('ReportEventTypes').allEvents) > -1) { - eventType = [Ext.getStore('ReportEventTypes').allEvents]; + if (eventType.indexOf(Traccar.store.ReportEventTypes.allEvents) > -1) { + eventType = [Traccar.store.ReportEventTypes.allEvents]; } else if (eventType.length === this.lookupReference('eventTypeField').getStore().getCount() - 1) { - eventType = [Ext.getStore('ReportEventTypes').allEvents]; + eventType = [Traccar.store.ReportEventTypes.allEvents]; } this.getView().callingPanel.eventType = eventType; this.getView().callingPanel.fromDate = this.lookupReference('fromDateField').getValue(); -- cgit v1.2.3