Bug 12687 - Remove CGI::scrolling_list from circulation.pl

This patch removes the only instance in this file

To test:
1. Apply the patch
2. Search for patrons on staff CheckOut,
use a string that gives multiple results
3. Results are displayed on a select,
that was replaced.

4. Check for regressions: select a patron and press 'Select',
or do double click on a patron name, verify you go
to patron's checkout tab.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

diff --git a/circ/circulation.pl b/circ/circulation.pl
index b95bffa..c766e88 100755 (executable)
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -371,7 +371,7 @@ if ($borrowernumber) {
 
 my @values;
 my %labels;
-my $CGIselectborrower;
+my $selectborrower;
 if ($borrowerslist) {
     foreach (
         sort {(lc $a->{'surname'} cmp lc $b->{'surname'} || lc $a->{'firstname'} cmp lc $b->{'firstname'})
@@ -382,17 +382,10 @@ if ($borrowerslist) {
         $labels{ $_->{'borrowernumber'} } =
 "$_->{'surname'}, $_->{'firstname'} ... ($_->{'cardnumber'} - $_->{'categorycode'} - $_->{'branchcode'}) ...  $_->{'address'} ";
     }
-    $CGIselectborrower = CGI::scrolling_list(
-        -name     => 'borrowernumber',
-        -class    => 'focus',
-        -id       => 'borrowernumber',
-        -values   => \@values,
-        -labels   => \%labels,
-        -ondblclick => 'document.forms[\'mainform\'].submit()',
-        -size     => 7,
-        -tabindex => '',
-        -multiple => 0
-    );
+    $selectborrower = {
+        values => \@values,
+        labels => \%labels,
+    };
 }
 
 #title
@@ -544,7 +537,7 @@ $template->param(
     stickyduedate     => $stickyduedate,
     duedatespec       => $duedatespec,
     message           => $message,
-    CGIselectborrower => $CGIselectborrower,
+    selectborrower    => $selectborrower,
     totaldue          => sprintf('%.2f', $total),
     inprocess         => $inprocess,
     is_child          => ($borrowernumber && $borrower->{'category_type'} eq 'C'),

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index d573ba4..fd65b02 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -41,7 +41,7 @@ var relatives_borrowernumbers = new Array();
 var MSG_ADD_MESSAGE = _("Add a new message");
 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
 [% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %]
-[% UNLESS ( borrowernumber ) %][% UNLESS ( CGIselectborrower ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
+[% UNLESS ( borrowernumber ) %][% UNLESS ( selectborrower ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %]
 
 $(document).ready(function() {
     [% IF !( CircAutoPrintQuickSlip == 'clear' ) %]
@@ -68,7 +68,7 @@ $(document).ready(function() {
     <strong>Checkouts</strong>
 [% END %]
 </div>
-[% IF ( CGIselectborrower ) %]
+[% IF ( selectborrower ) %]
 <div id="doc" class="yui-t7">
 
    <div id="bd">
@@ -433,7 +433,7 @@ No patron matched <span class="ex">[% message %]</span>
 [% END %]
 
 
-[% IF ( CGIselectborrower ) %]
+[% IF ( selectborrower ) %]
 [% INCLUDE 'patron-toolbar.inc' %]
 
 <form method="post" action="/cgi-bin/koha/circ/circulation.pl" id="mainform" name="mainform" autocomplete="off">
@@ -447,13 +447,17 @@ No patron matched <span class="ex">[% message %]</span>
 
 <ol>    <li>
     <label for="borrowernumber">Select a patron: </label>
-    [% CGIselectborrower %]
+    <select name="borrowernumber" id="borrowernumber" size="7" class="focus" ondblclick="document.forms['mainform'].submit()">
+        [% FOREACH borrower IN selectborrower.values %]
+        <option value="[% borrower %]">[% selectborrower.labels.$borrower %]</option>
+        [% END %]
+    </select>
     </li>
 </ol>
 <p><input type="submit" value="Select" /></p>
 </fieldset>
 </form>
-[% ELSE %] <!-- CGIselectborrower -->
+[% ELSE %] <!-- selectborrower -->
 
 <!-- BARCODE ENTRY -->
 
@@ -800,7 +804,7 @@ No patron matched <span class="ex">[% message %]</span>
 
 </div>
 </div>
-[% UNLESS ( CGIselectborrower ) %][% IF ( borrowernumber ) %]<div class="yui-b">
+[% UNLESS ( selectborrower ) %][% IF ( borrowernumber ) %]<div class="yui-b">
 [% INCLUDE 'circ-menu.inc' %]
 </div>[% END %][% END %]
 </div>