From 56eb72ac5563d245a17c14a5d455f89585fa74d6 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Sat, 12 May 2018 16:42:28 +0200 Subject: [PATCH] department/export now uses the download system --- build/api/module/department/exportController.php | 10 ++++++++-- config/modules.json | 3 ++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build/api/module/department/exportController.php b/build/api/module/department/exportController.php index d14a8f7..ccefcea 100644 --- a/build/api/module/department/exportController.php +++ b/build/api/module/department/exportController.php @@ -149,7 +149,7 @@ class exportController } //set content type headers - header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + // header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); //reating writer $writer = new \PhpOffice\PhpSpreadsheet\Writer\Xls($spreadsheet); @@ -170,7 +170,13 @@ class exportController $writer->save("$tmpFilename"); //get file content - echo file_get_contents($tmpFilename); + return [ + 'headers' => [ + 'Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'Content-Disposition' => 'attachment; filename=archive.xsl' + ], + 'body' => file_get_contents($tmpFilename) + ]; } } \ No newline at end of file diff --git a/config/modules.json b/config/modules.json index 6602225..e514e58 100644 --- a/config/modules.json +++ b/config/modules.json @@ -121,7 +121,8 @@ "GET": { "des": "Export the data of the current department and version to a Excel file", "per": [["cas_admin"]], - "par": {} + "par": {}, + "opt": { "download": true } } }, "version":{