From 16a35fb6315567f2631ed1598031c94ef25505df Mon Sep 17 00:00:00 2001 From: Aleisha Date: Fri, 29 Apr 2016 02:47:06 +0000 Subject: [PATCH] Bug 16388: Move option to download report into reports toolbar MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To test: 1) Create a new SQL report or edit a report 2) Ensure that the download option does NOT show in the toolbar 3) Save and run the report 4) Confirm that download option DOES show in toolbar as a dropdown with the 3 options (csv, tab and ods) 5) Confirm that downloading all 3 file types works as expected Sponsored-by: Catalyst IT Signed-off-by: Owen Leonard Signed-off-by: Jonathan Druart Signed-off-by: Brendan Gallagher (cherry picked from commit e7ac7abf16c76a00a5dcd8e8cd1e62522675b8ee) Signed-off-by: Frédéric Demians --- .../prog/en/includes/reports-toolbar.inc | 14 +++++++++++++- .../en/modules/reports/guided_reports_start.tt | 13 ------------- reports/guided_reports.pl | 1 + 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc index 198a364f7c..42878e1215 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -9,7 +9,7 @@ [% END %] - [% IF ( showsql || execute || editsql || save_successful ) %] + [% IF ( showsql || execute || editsql || save_successful || runreport ) %] [% IF ( CAN_user_reports_create_reports ) %] [% UNLESS ( editsql ) # Do not show edit button on edit page %]
@@ -45,6 +45,18 @@
[% END %] + + [% IF ( runreport ) %] + + [% END %] + [% END %] 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 066df5f147..b01d579e72 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,19 +841,6 @@ canned reports and writing custom SQL reports.

[% END %] -
-
- - - - -
- -
[% END %] [% END %] diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index 75040f4278..8fa0811c16 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -787,6 +787,7 @@ elsif ($phase eq 'Run this report'){ $url = join('&sql_params=', $url, map { URI::Escape::uri_escape_utf8($_) } @sql_params); } $template->param( + 'runreport' => 1, 'results' => \@rows, 'sql' => $sql, 'id' => $report_id, -- 2.39.5