From f911c57996b7a53b48a2c45b20f0fde9ea050371 Mon Sep 17 00:00:00 2001 From: Bernardo Gonzalez Kriegel Date: Tue, 26 May 2015 11:00:02 -0300 Subject: [PATCH] Bug 14275: Remove CGI::scrolling_list from guided_reports.pl MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove an instance of CGI::scrolling_list from this file To test: 1) Go to Reports, Guided report wizard, New SQL report 2) Create a report with some auth value list, e.g. SELECT surname,firstname FROM borrowers WHERE branchcode=<> Save 3) Clic on 'Run this report", look at the dropdown, that will be changed 4) Apply the patch 5) Reload, check dropdown and any regression Followed test plan, works as expected. Signed-off-by: Marc Véron Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 764b425c1ce0573f9b02bfa3b9b2425137630f0c) Signed-off-by: Chris Cormack Signed-off-by: Liz Rea --- .../en/modules/reports/guided_reports_start.tt | 8 +++++++- reports/guided_reports.pl | 17 ++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) 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 a7590d999f..739f509c97 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 @@ -782,7 +782,13 @@ canned reports and writing custom SQL reports.

[% ELSIF ( sql_param.input == 'text' ) %]
  • [% ELSE %] -
  • [% sql_param.input %]
  • +
  • + +
  • [% END %] [% END %] diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index de698ef2d6..3daf5223c2 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -721,17 +721,12 @@ elsif ($phase eq 'Run this report'){ } $labelid = $text; $labelid =~ s/\W//g; - $input =CGI::scrolling_list( # FIXME: factor out scrolling_list - -name => "sql_params", - -id => "sql_params_".$labelid, - -values => \@authorised_values, -# -default => $value, - -labels => \%authorised_lib, - -override => 1, - -size => 1, - -multiple => 0, - -tabindex => 1, - ); + $input = { + name => "sql_params", + id => "sql_params_".$labelid, + values => \@authorised_values, + labels => \%authorised_lib, + }; } push @tmpl_parameters, {'entry' => $text, 'input' => $input, 'labelid' => $labelid }; -- 2.39.5