@@ -, +, @@ toolbar --- .../prog/en/includes/reports-toolbar.inc | 25 +++++++++++++++++++- .../en/modules/reports/guided_reports_start.tt | 13 ---------- reports/guided_reports.pl | 1 + 3 files changed, 25 insertions(+), 14 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ a/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,29 @@
[% END %] + + [% IF ( runreport ) %] +
+
+
+
+ +
+
+ + + +
+
+ +
+
+ [% END %] + [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -827,19 +827,6 @@ canned reports and writing custom SQL reports.

[% END %] -
-
- - - - -
- -
[% END %] [% END %] --- a/reports/guided_reports.pl +++ a/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, --