From acdc5f27a7625746d004e62f865c384c566fb2ef Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 13 May 2016 15:28:50 +0100
Subject: [PATCH] Bug 16388: Use existing 'execute' parameter instead of
 creating a new one
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

An existing 'execute' parameter is already passed to the template when
we need to display the 'Download' button, so let's use it instead of
creating a new one.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Brendan Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit c2f53bd039aa2ce52c2ddc3a2314e32b44ae4ee8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc | 4 ++--
 reports/guided_reports.pl                                    | 1 -
 2 files changed, 2 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 42878e1215..09298ea2a3 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 @@
         </div>
     [% END %]
 
-    [% IF ( showsql || execute || editsql || save_successful || runreport ) %]
+    [% IF ( showsql || execute || editsql || save_successful ) %]
         [% IF ( CAN_user_reports_create_reports ) %]
             [% UNLESS ( editsql ) # Do not show edit button on edit page %]
                 <div class="btn-group">
@@ -46,7 +46,7 @@
             </div>
         [% END %]
 
-        [% IF ( runreport ) %]
+        [% IF ( execute ) %]
             <div class="btn-group">
                 <button class="btn btn-small dropdown-toggle" data-toggle="dropdown" id="format"><i class="fa fa-upload"></i> Download <span class="caret"></span></button>
                 <ul class="dropdown-menu">
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index 8fa0811c16..75040f4278 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -787,7 +787,6 @@ elsif ($phase eq 'Run this report'){
                 $url = join('&amp;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