From 19a92751863342105414c24153da2a0376f774c0 Mon Sep 17 00:00:00 2001 From: Alex Buckley 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 --- C4/Reserves.pm | 2 +- .../prog/en/modules/reserve/request.tt | 6 +-- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 54 +++++++++++----------- opac/opac-reserve.pl | 5 -- 4 files changed, 31 insertions(+), 36 deletions(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index 78e8f6a..48aab41 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -172,7 +172,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 915c4d7..a18e4f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -316,9 +316,9 @@ Hold must be record level [% ELSIF ( itemloo.available ) %] - + [% ELSIF ( itemloo.override ) %] - + [% ELSE %] @@ -671,7 +671,7 @@ }; var MSG_NO_ITEMS_AVAILABLE = _("A hold cannot be requested on any of these items."); 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 41a0ef6..e3e0834 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -150,12 +150,12 @@ [% FOREACH bibitemloo IN bibitemloop %]
- +

[% IF ( bibitemloo.holdable ) %] - + @@ -224,7 +224,7 @@

  • [% UNLESS ( bibitemloo.holdable ) %] - [% PROCESS options_for_libraries libraries => Branches.all({ search_params => { pickup_location => 1 }, selected => branch }) %] [% ELSE %] @@ -300,16 +300,16 @@