From ba230949afada7ffe7578ae6cd0a76b0f431fb7f 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 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 --- .../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 f03d71c..e769af2 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 @@ -783,7 +783,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 b29fc99..5d8b302 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -722,17 +722,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 }; -- 1.7.9.5