From c9eef789a47fb11342a845180b2aad6ecce0d710 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 13 Sep 2016 14:41:51 +0100 Subject: [PATCH] Bug 16816: Do not copy parameters used when duplicating a report If a report is duplicated from the report list, the new report will contain the tag (<> for instance), but from the reports results page it copies the values used for the results. Test plan: Create a new sql report with tags Duplicate it from the report list: no expected changes Run it and duplicate it: the tags must not have been replaced Signed-off-by: Andreas Roussos Ran and duplicated a report, the tags remained intact. --- koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc | 2 +- reports/guided_reports.pl | 5 +++-- 2 files changed, 4 insertions(+), 3 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 232ddd3..aa86bc2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc @@ -19,7 +19,7 @@ [% END %] diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index a9963db..45454b0 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -638,9 +638,9 @@ elsif ($phase eq 'Run this report'){ 'report_id' => $report_id, ); - my ( $sql, $type, $name, $notes ); + my ( $sql, $original_sql, $type, $name, $notes ); if (my $report = get_saved_report($report_id)) { - $sql = $report->{savedsql}; + $sql = $original_sql = $report->{savedsql}; $name = $report->{report_name}; $notes = $report->{notes}; @@ -790,6 +790,7 @@ elsif ($phase eq 'Run this report'){ $template->param( 'results' => \@rows, 'sql' => $sql, + original_sql => $original_sql, 'id' => $report_id, 'execute' => 1, 'name' => $name, -- 2.1.4