From 65772a1ffbb98a71ce0de2e7fb1a434aaa47b926 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Mon, 17 Oct 2016 18:14:13 +0500
Subject: Use "Export" for button name

Do not pass accept header to function
---
 web/app/view/Report.js           |  4 ++--
 web/app/view/ReportController.js | 13 ++++++-------
 web/l10n/en.json                 |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'web')

diff --git a/web/app/view/Report.js b/web/app/view/Report.js
index b07bd1c..a1fbd1b 100644
--- a/web/app/view/Report.js
+++ b/web/app/view/Report.js
@@ -49,8 +49,8 @@ Ext.define('Traccar.view.Report', {
         disabled: true,
         handler: 'onReportClick'
     }, {
-        text: Strings.reportXlsx,
-        reference: 'xlsxButton',
+        text: Strings.reportExport,
+        reference: 'exportButton',
         disabled: true,
         handler: 'onReportClick'
     }, {
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 49d6d77..e8198b3 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -74,11 +74,11 @@ Ext.define('Traccar.view.ReportController', {
         time = this.fromDate && this.fromTime && this.toDate && this.toTime;
         disabled = !reportType || !devices || !time;
         this.lookupReference('showButton').setDisabled(disabled);
-        this.lookupReference('xlsxButton').setDisabled(disabled);
+        this.lookupReference('exportButton').setDisabled(disabled);
     },
 
     onReportClick: function (button) {
-        var reportType, from, to, store, url, accept;
+        var reportType, from, to, store, url;
 
         reportType = this.lookupReference('reportTypeField').getValue();
 
@@ -102,10 +102,9 @@ Ext.define('Traccar.view.ReportController', {
                         to: to.toISOString()
                     }
                 });
-            } else if (button.reference === 'xlsxButton') {
+            } else if (button.reference === 'exportButton') {
                 url = this.getView().getStore().getProxy().url;
-                accept = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
-                this.downloadFile(url, accept, {
+                this.downloadFile(url, {
                     deviceId: this.deviceId,
                     groupId: this.groupId,
                     type: this.eventType,
@@ -167,13 +166,13 @@ Ext.define('Traccar.view.ReportController', {
         });
     },
 
-    downloadFile: function (requestUrl, acceptHeader, requestParams) {
+    downloadFile: function (requestUrl, requestParams) {
         Ext.Ajax.request({
             url: requestUrl,
             method: 'GET',
             params: requestParams,
             headers: {
-                Accept: acceptHeader
+                Accept: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
             },
             binary: true,
             success: function (response) {
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 6dbd81d..46fb858 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -160,7 +160,7 @@
     "reportSummary": "Summary",
     "reportConfigure": "Configure",
     "reportEventTypes": "Event Types",
-    "reportXlsx": "XLSX",
+    "reportExport": "Export",
     "reportDeviceName": "Device Name",
     "reportAverageSpeed": "Average Speed",
     "reportMaximumSpeed": "Maximum Speed",
-- 
cgit v1.2.3