Attachment 39563 Details for Bug 14275 – [Signed-off] Bug 14275: Remove CGI::scrolling_list from guided_reports.pl

[patch] [Signed-off] Bug 14275: Remove CGI::scrolling_list from guided_reports.pl

Signed-off-Bug-14275-Remove-CGIscrollinglist-from-.patch (text/plain), 3.63 KB, created by Marc Véron on 2015-05-27 07:08:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2015-05-27 07:08:02 UTC

Size: 3.63 KB

patch

obsolete

>From be6737aa37eea34bf0e74cb41cec5a3c29da9acc Mon Sep 17 00:00:00 2001
>From: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
>Date: Tue, 26 May 2015 11:00:02 -0300
>Subject: [PATCH] [Signed-off] Bug 14275: Remove CGI::scrolling_list from
> guided_reports.pl
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>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=<<Enter patrons library|branches>>
>
>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 <veron@veron.ch>
>---
> .../prog/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.</p>
>                 [% ELSIF ( sql_param.input == 'text' ) %]
>                     <li><label for="sql_params[% loop.count %]">[% sql_param.entry %]: </label><input id="sql_params[% loop.count %]" type="text" name="sql_params" /></li>
>                 [% ELSE %]
>-                    <li><label for="sql_params_[% sql_param.labelid %]">[% sql_param.entry %]:</label> [% sql_param.input %]</li>
>+                    <li><label for="sql_params_[% sql_param.labelid %]">[% sql_param.entry %]:</label>
>+                        <select name="[%- sql_param.input.name -%]" tabindex="1"  size="1" id="[%- sql_param.input.id -%]">
>+                        [% FOREACH value IN sql_param.input.values %]
>+                            <option value="[%- value -%]">[%- sql_param.input.labels.$value -%]</option>
>+                        [% END %]
>+                        </select>
>+                    </li>
>                 [% END %]
>             [% END %]
>             </ol>
>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.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 14275: 39530 | 39563 | 39586