From 52634dfe47878d3ecfd2612582b354bd39ea4fac Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Tue, 30 Aug 2016 11:35:41 +0500 Subject: Add alias allEvents for "%" --- web/app/view/ReportConfigController.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/app/view/ReportConfigController.js') diff --git a/web/app/view/ReportConfigController.js b/web/app/view/ReportConfigController.js index d98690e95..5bd6ae7ef 100644 --- a/web/app/view/ReportConfigController.js +++ b/web/app/view/ReportConfigController.js @@ -44,10 +44,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('%') > -1) { - eventType = ['%']; + if (eventType.indexOf(Ext.getStore('ReportEventTypes').allEvents) > -1) { + eventType = [Ext.getStore('ReportEventTypes').allEvents]; } else if (eventType.length === this.lookupReference('eventTypeField').getStore().getCount() - 1) { - eventType = ['%']; + eventType = [Ext.getStore('ReportEventTypes').allEvents]; } this.getView().callingPanel.eventType = eventType; this.getView().callingPanel.fromDate = this.lookupReference('fromDateField').getValue(); -- cgit v1.2.3