From 306e341c656f7c1803283c66d325c3bbe5cfbb6e Mon Sep 17 00:00:00 2001
From: Alex Buckley <alexbuckley@catalyst.net.nz>
Date: Sun, 28 Oct 2018 18:00:31 +0000
Subject: [PATCH] Bug 15565: (follow-up) Removed leftover debug code and added
 missing filters

Sponsord-By: Brimbank Library, Australia

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 C4/Reserves.pm                                     |  2 +-
 .../prog/en/modules/reserve/request.tt             |  6 +--
 .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 50 +++++++++++-----------
 opac/opac-reserve.pl                               |  5 ---
 4 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index e263375..39adfeb 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -170,7 +170,7 @@ sub AddReserve {
 
     $expdate = output_pref({ str => $expdate, dateonly => 1, dateformat => 'iso' });
 
-    # if we have an item selectionned, and the pickup branch is the same as the holdingbranch
+    # if we have an item selected, and the pickup branch is the same as the holdingbranch
     # of the document, we force the value $priority and $found .
     if ( $checkitem and not C4::Context->preference('ReservesNeedReturns') ) {
         $priority = 0;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index b875285..a3b1676 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -317,9 +317,9 @@
                         Hold must be record level
                     </span>
                 [% ELSIF ( itemloo.available ) %]
-                    <input type="checkbox" name="checkitem" value="[% itemloo.itemnumber %]" />
+                    <input type="checkbox" name="checkitem" value="[% itemloo.itemnumber | html %]" />
                 [% ELSIF ( itemloo.override ) %]
-                    <input type="checkbox" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber %]" />
+                    <input type="checkbox" name="checkitem" class="needsoverride" value="[% itemloo.itemnumber | html %]" />
                     <i class="fa fa-exclamation-triangle fa-lg" style="color:gold" alt="Requires override of hold policy"/></i>
                 [% ELSE %]
                     <span class="error">
@@ -678,7 +678,7 @@
         var MSG_NO_ITEMS_AVAILABLE = _("A hold cannot be requested on any of these items.");
         columns_settings_borrowers_table = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
         var MSG_EXCEEDED_HOLDS_PER_RECORD = _("Patron has exceeded the number of holds for this record.");
-        var remainingHolds = "[% remaining_holds_for_record %]";
+        var remainingHolds = "[% remaining_holds_for_record | html %]";
 
         $(document).ready(function() {
             function ToggleHoldsToPlace() {
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index 78f35da..1b1b17e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -155,7 +155,7 @@
 
                                 [% FOREACH bibitemloo IN bibitemloop %]
                                     <div class="holdrow">
-                                        <input id="remaining_holds_[% bibitemloo.biblionumber %]" type="hidden" value="[% bibitemloo.remaining_holds_for_record %]"/>
+                                        <input id="remaining_holds_[% bibitemloo.biblionumber | html %]" type="hidden" value="[% bibitemloo.remaining_holds_for_record | html %]"/>
                                         <p>
                                             [% IF ( bibitemloo.holdable ) %]
                                                 <span title="[% bibitemloo.biblionumber %]" style="padding:.3em">
@@ -228,7 +228,7 @@
                                                             <li class="branch">
                                                                 <label for="branch_[% bibitemloo.biblionumber | html %]">Pick up location:</label>
                                                                 [% UNLESS ( bibitemloo.holdable ) %]
-                                                                    <select name="branch_[% bibitemloo.biblionumber %]" id="branch_[% bibitemloo.biblionumber | html %]" disabled="disabled">
+                                                                    <select name="branch_[% bibitemloo.biblionumber | html %]" id="branch_[% bibitemloo.biblionumber | html %]" disabled="disabled">
                                                                         [% PROCESS options_for_libraries libraries => Branches.pickup_locations( biblio => bibitemloo.biblionumber, selected => branch ) %]
                                                                     </select>
                                                                 [% ELSE %]
@@ -304,16 +304,16 @@
 
                                                         <!-- ITEM HOLDS -->
                                                         <li class="lradio place_on_type" style="display:none;">
-                                                                <label class="radio inline" for="reqany_[% bibitemloo.biblionumber %]">Next available item</label>
-                                                                <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
-                                                                        id="reqany_[% bibitemloo.biblionumber %]"
+                                                                <label class="radio inline" for="reqany_[% bibitemloo.biblionumber | html %]">Next available item</label>
+                                                                <input type="radio" name="reqtype_[% bibitemloo.biblionumber | html %]"
+                                                                        id="reqany_[% bibitemloo.biblionumber | html %]"
                                                                         class="selectany"
                                                                         value="Any"
                                                                         checked="checked"
                                                                 />
-                                                            <label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber %]">A specific item</label>
-                                                            <input type="radio" name="reqtype_[% bibitemloo.biblionumber %]"
-                                                                   id="reqspecific_[% bibitemloo.biblionumber %]"
+                                                            <label class="radio inline" for="reqspecific_[% bibitemloo.biblionumber | html %]">A specific item</label>
+                                                            <input type="radio" name="reqtype_[% bibitemloo.biblionumber | html %]"
+                                                                   id="reqspecific_[% bibitemloo.biblionumber | html %]"
                                                                    class="selectspecific"
                                                                    value="Specific"
                                                             />
@@ -322,20 +322,20 @@
 
                                                     [% IF bibitemloo.remaining_holds_for_record > 1 %]
                                                         [% SET count = 1 %]
-                                                        <div id="holds_to_place_[% bibitemloo.biblionumber %]" class="hold-options holds-to-place">
+                                                        <div id="holds_to_place_[% bibitemloo.biblionumber | html %]" class="hold-options holds-to-place">
                                                             <label>Holds to place (count)</label>
-                                                            <select name="holds_to_place_count_[% bibitemloo.biblionumber %]">
+                                                            <select name="holds_to_place_count_[% bibitemloo.biblionumber | html %]">
                                                             [% WHILE count <= bibitemloo.remaining_holds_for_record %]
-                                                                <option value="[% count %]">[% count %]</option>
+                                                                <option value="[% count | html %]">[% count | html %]</option>
                                                                 [% SET count = count + 1 %]
                                                             [% END %]
                                                             </select>
                                                         </div>
                                                     [% ELSE %]
-                                                        <input type="hidden" name="holds_to_place_count_[% bibitemloo.biblionumber %]" value="1" />
+                                                        <input type="hidden" name="holds_to_place_count_[% bibitemloo.biblionumber | html %]" value="1" />
                                                     [% END %]
 
-                                                        <table class="copiesrow table table-bordered table-striped" id="copiesrow_[% bibitemloo.biblionumber %]">
+                                                        <table class="copiesrow table table-bordered table-striped" id="copiesrow_[% bibitemloo.biblionumber | html %]">
                                                             <caption>Select a specific item:</caption>
                                                             <tr>
                                                                 <th>Copy number</th>
@@ -361,9 +361,9 @@
                                                                 <tr class="[% itemLoo.backgroundcolor | html %]">
                                                                     <td class="copynumber">
                                                                         [% IF ( itemLoo.available ) %]
-                                                                            <input type="checkbox" class="checkitem checkitem_[% bibitemloo.biblionumber %]" name="checkitem_[% bibitemloo.biblionumber %]" value="[% itemLoo.itemnumber %]" />
+                                                                            <input type="checkbox" class="checkitem checkitem_[% bibitemloo.biblionumber | html %]" name="checkitem_[% bibitemloo.biblionumber | html %]" value="[% itemLoo.itemnumber | html %]" />
                                                                         [% ELSE %]
-                                                                            <input disabled="disabled" type="checkbox" class="checkitem" name="checkitem" value="[% itemLoo.itemnumber %]"
+                                                                            <input disabled="disabled" type="checkbox" class="checkitem" name="checkitem" value="[% itemLoo.itemnumber | html %]"
                                                                                    style="display:none;" />
                                                                             <img src="[% interface | html %]/lib/famfamfam/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />
                                                                         [% END %]
@@ -522,19 +522,19 @@
         [% FOREACH bibitemloo IN bibitemloop %]
             [% IF bibitemloo.force_hold %]
                 [% IF bibitemloo.force_hold == 'item' %]
-                    $("#toggle-hold-options-[% bibitemloo.biblionumber %]").click();
-                    $("#reqspecific_[% bibitemloo.biblionumber %]").attr('checked', true);
-                    $("#holds_to_place_[% bibitemloo.biblionumber %]").hide();
-                    $("#copiesrow_[% bibitemloo.biblionumber %]").show();
+                    $("#toggle-hold-options-[% bibitemloo.biblionumber | html %]").click();
+                    $("#reqspecific_[% bibitemloo.biblionumber | html %]").attr('checked', true);
+                    $("#holds_to_place_[% bibitemloo.biblionumber | html %]").hide();
+                    $("#copiesrow_[% bibitemloo.biblionumber | html %]").show();
                 [% ELSIF bibitemloo.force_hold == 'record' %]
-                    $("#toggle-hold-options-[% bibitemloo.biblionumber %]").click();
-                    $("#reqany_[% bibitemloo.biblionumber %]").attr('checked', true);
+                    $("#toggle-hold-options-[% bibitemloo.biblionumber | html %]").click();
+                    $("#reqany_[% bibitemloo.biblionumber | html %]").attr('checked', true);
                 [% END %]
-                $("#reqany_[% bibitemloo.biblionumber %]").attr('disabled', 'disabled');
-                $("#reqspecific_[% bibitemloo.biblionumber %]").attr('disabled', 'disabled');
+                $("#reqany_[% bibitemloo.biblionumber | html %]").attr('disabled', 'disabled');
+                $("#reqspecific_[% bibitemloo.biblionumber | html %]").attr('disabled', 'disabled');
             [% END %]
             [% IF bibitemloo.reqholdnotes %]
-                $("#holdnotes_[% bibitemloo.biblionumber %]").attr( 'required', true );
+                $("#holdnotes_[% bibitemloo.biblionumber | html %]").attr( 'required', true );
             [% END %]
         [% END %]
 
@@ -617,7 +617,7 @@
 
         // When 'Place Hold' button is clicked
         $(".placehold").click(function(){
-            if (total_requested() + [% reserves_count %] > [% maxreserves %]) {
+            if (total_requested() + [% reserves_count | html %] > [% maxreserves | html %]) {
                 alert(MSG_MAX_HOLDS_EXCEEDED);
                 return false;
             }
diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 84b223a..ef2ca90 100755
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -44,7 +44,6 @@ use Koha::Libraries;
 use Koha::Patrons;
 use Date::Calc qw/Today Date_to_Days/;
 use List::MoreUtils qw/uniq/;
-use Data::Dumper;
 
 my $maxreserves = C4::Context->preference("maxreserves");
 
@@ -283,10 +282,7 @@ if ( $query->param('place_reserve') ) {
                     $found = 'W'
                       unless C4::Context->preference('ReservesNeedReturns');
                 }
-                warn $itemnumber;
-                warn $canreserve;
                 if ($canreserve) {
-                    warn $canreserve;
                     my $reserve_id = AddReserve(
                         $branch,         $borrowernumber,
                         $biblionumber,
@@ -640,7 +636,6 @@ foreach my $biblioNum (@biblionumbers) {
         }
     );
     my $forced_hold_level = $holds->forced_hold_level();
-    warn $forced_hold_level;
     if ($forced_hold_level) {
         #$biblioLoopIter{force_hold}   = 1 if $forced_hold_level eq 'item';
         #$biblioLoopIter{itemholdable} = 0 if $forced_hold_level eq 'record';
-- 
2.1.4