Attachment 55640 Details for Bug 16816 – [PASSED QA] Bug 16816: Do not copy parameters used when duplicating a report

[patch] [PASSED QA] Bug 16816: Do not copy parameters used when duplicating a report

PASSED-QA-Bug-16816-Do-not-copy-parameters-used-wh.patch (text/plain), 2.84 KB, created by Katrin Fischer on 2016-09-18 08:58:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2016-09-18 08:58:59 UTC

Size: 2.84 KB

patch

obsolete

>From 0416801309d6654b5928966aa703db5e1823e6b0 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 13 Sep 2016 14:41:51 +0100
>Subject: [PATCH] [PASSED QA] 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 (<<YEAR>> 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 <arouss1980@gmail.com>
>Ran and duplicated a report, the tags remained intact.
>
>Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>
>---
> 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 @@
>                 </div>
>             [% END %]
>             <div class="btn-group">
>-                <a class="btn btn-small" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% sql |uri %]&amp;reportname=[% reportname |uri %]&amp;notes=[% notes |uri %]">
>+                <a class="btn btn-small" title="Duplicate this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?phase=Create report from SQL&amp;sql=[% original_sql || sql |uri %]&amp;reportname=[% reportname |uri %]&amp;notes=[% notes |uri %]">
>                     <i class="fa fa-copy"></i> Duplicate
>                 </a>
>             </div>
>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.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 16816: 55532 | 55633 | 55640