Attachment 38135 Details for Bug 14013 – Bug 14013 - Use name of a saved report as part of the file name for download

[patch] Bug 14013 - Use name of a saved report as part of the file name for download

Bug-14013---Use-name-of-a-saved-report-as-part-of-.patch (text/plain), 2.76 KB, created by Mark Tompsett on 2015-04-19 17:46:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2015-04-19 17:46:32 UTC

Size: 2.76 KB

patch

obsolete

>From 58b205a5e14d8b5ee5e52a6b3cb73684e35185ac Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Sun, 19 Apr 2015 18:40:09 +0200
>Subject: [PATCH] Bug 14013 - Use name of a saved report as part of the file
> name for download
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>This patch propoeses the name of a saved report as part of the download file name.
>
>To test:
>
>- Apply patch
>- Got to Home > Reports > Guided reports wizard > Saved reports (or create a new report from sql)
>- Run a saved report
>- Download the report (as csv, tab, ods)
>Result: The downlaod file name proposed should be prepended by the report name, separated with a -
>
>- Bonus test: Try to downlaod saved reports which have special character in their name.
>
>NOTE: Used "Ã±/Ã¢ is N/A" as a report name. The /'s were translated
>      to underscored, but the letters were as expected.
>
>Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
>---
> .../intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt     | 1 +
> reports/guided_reports.pl                                             | 4 +++-
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>index d2420a0..d77824d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
>@@ -841,6 +841,7 @@ canned reports and writing custom SQL reports.</p>
> <input type="hidden" name="sql" value="[% sql |html %]" />
> <input type="hidden" name="phase" value="Export" />
> <input type="submit" name="submit" value="Download" /></fieldset>
>+<input type="hidden" name="reportname" value="[% name %]" />
> </form>
> [% END %]
> [% END %]
>diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
>index a3009b2..93b9569 100755
>--- a/reports/guided_reports.pl
>+++ b/reports/guided_reports.pl
>@@ -797,6 +797,8 @@ elsif ($phase eq 'Export'){
> 	# export results to tab separated text or CSV
> 	my $sql    = $input->param('sql');  # FIXME: use sql from saved report ID#, not new user-supplied SQL!
>     my $format = $input->param('format');
>+    my $reportname = $input->param('reportname');
>+    my $reportfilename = $reportname ? "$reportname-reportresults.$format" : "reportresults.$format" ;
> 	my ($sth, $q_errors) = execute_query($sql);
>     unless ($q_errors and @$q_errors) {
>         my ( $type, $content );
>@@ -870,7 +872,7 @@ elsif ($phase eq 'Export'){
>         }
>         print $input->header(
>             -type => $type,
>-            -attachment=>"reportresults.$format"
>+            -attachment=> $reportfilename
>         );
>         print $content;
> 
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 14013: 38134 | 38135 | 38173