diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-03-27 18:12:39 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-27 18:12:39 +1300 |
| commit | 9a5d244db1fe558388ecddccd0d60b674dc53d22 (patch) | |
| tree | 7e4411cc8cfed14bb376fe1e1155fe395f0e3199 | |
| parent | c4e1f652ca5ad459c2d29e1e3c92dc251c5adcb8 (diff) | |
| parent | 1602c0f76cfbc273239280b65dc528e231350908 (diff) | |
| download | etbsa-traccar-web-9a5d244db1fe558388ecddccd0d60b674dc53d22.tar.gz etbsa-traccar-web-9a5d244db1fe558388ecddccd0d60b674dc53d22.tar.bz2 etbsa-traccar-web-9a5d244db1fe558388ecddccd0d60b674dc53d22.zip | |
Merge pull request #449 from Abyss777/fix_deselecting
Fix two small deselecting issues
| -rw-r--r-- | web/app/view/ReportController.js | 3 | ||||
| -rw-r--r-- | web/app/view/StateController.js | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index 9decb65..c02964e 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -110,8 +110,9 @@ Ext.define('Traccar.view.ReportController', { onReportClick: function (button) { var reportType, from, to, store, url; - reportType = this.lookupReference('reportTypeField').getValue(); + this.getGrid().getSelectionModel().deselectAll(); + reportType = this.lookupReference('reportTypeField').getValue(); if (reportType && (this.deviceId || this.groupId)) { from = new Date( this.fromDate.getFullYear(), this.fromDate.getMonth(), this.fromDate.getDate(), diff --git a/web/app/view/StateController.js b/web/app/view/StateController.js index 0833186..661bc96 100644 --- a/web/app/view/StateController.js +++ b/web/app/view/StateController.js @@ -167,8 +167,10 @@ Ext.define('Traccar.view.StateController', { }, clearReport: function (store) { - this.position = null; - Ext.getStore('Attributes').removeAll(); + if (!this.deviceId) { + this.position = null; + Ext.getStore('Attributes').removeAll(); + } }, onSelectionChange: function (selected, records) { |