From 5bdf9acf67b5a0ee6c47b047ed722ccab0b3feab Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 24 Aug 2018 15:10:45 +0000
Subject: [PATCH] Bug 15524: (RM follow-up) Fix calls and add filter

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 C4/Circulation.pm                                            | 2 +-
 C4/Reserves.pm                                               | 2 +-
 Koha/REST/V1/Hold.pm                                         | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 2 +-
 reserve/request.pl                                           | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 9c14365947..77885d6cd0 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -1183,7 +1183,7 @@ sub checkHighHolds {
             }
 
             # Remove any items that are not holdable for this patron
-            @items = grep { CanItemBeReserved( $borrower->{borrowernumber}, $_->itemnumber ) eq 'OK' } @items;
+            @items = grep { CanItemBeReserved( $borrower->{borrowernumber}, $_->itemnumber )->{status} eq 'OK' } @items;
 
             my $items_count = scalar @items;
 
diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 38f9953c09..3b1ac5ef9f 100644
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -299,7 +299,7 @@ sub CanBookBeReserved{
          { status => ageRestricted },   if the Item is age restricted for this borrower.
          { status => damaged },         if the Item is damaged.
          { status => cannotReserveFromOtherBranches }, if syspref 'canreservefromotherbranches' is OK.
-         { status => tooManyReserves, limit => $limit }, if the borrower has exceeded his maximum reserve amount.
+         { status => tooManyReserves, limit => $limit }, if the borrower has exceeded their maximum reserve amount.
          { status => notReservable },   if holds on this item are not allowed
 
 =cut
diff --git a/Koha/REST/V1/Hold.pm b/Koha/REST/V1/Hold.pm
index c152fb71bb..c3cb926e78 100644
--- a/Koha/REST/V1/Hold.pm
+++ b/Koha/REST/V1/Hold.pm
@@ -91,7 +91,7 @@ sub add {
 
     unless ($can_reserve->{status} eq 'OK') {
         return $c->render( status => 403, openapi => {
-            error => "Reserve cannot be placed. Reason: $can_reserve"
+            error => "Reserve cannot be placed. Reason: ". $can_reserve->{status}
         } );
     }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index df1798a153..058e70a2de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -515,7 +515,7 @@
                         <td>[% IF ( branch_cat_rule_loo.unlimited_max_holds ) %]
                                 Unlimited
                             [% ELSE %]
-                                [% branch_cat_rule_loo.max_holds %]
+                                [% branch_cat_rule_loo.max_holds | html %]
                             [% END %]
                         </td>
 
diff --git a/reserve/request.pl b/reserve/request.pl
index 2fd36e8e75..cbbd35bf87 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -471,7 +471,7 @@ foreach my $biblionumber (@biblionumbers) {
                        !$item->{cantreserve}
                     && !$exceeded_maxreserves
                     && IsAvailableForItemLevelRequest($item, $patron_unblessed)
-                    && $can_item_be_reserved eq 'OK'
+                    && $can_item_be_reserved->{status} eq 'OK'
                   )
                 {
                     $item->{available} = 1;
@@ -479,7 +479,7 @@ foreach my $biblionumber (@biblionumbers) {
 
                     push( @available_itemtypes, $item->{itype} );
                 }
-                elsif ( $can_item_be_reserved eq 'tooManyReserves' && C4::Context->preference('AllowHoldPolicyOverride') ) {
+                elsif ( $can_item_be_reserved->{status} eq 'tooManyReserves' && C4::Context->preference('AllowHoldPolicyOverride') ) {
                     # If AllowHoldPolicyOverride is set, it should override EVERY restriction, not just branch item rules
                     $item->{override} = 1;
                     $num_override++;
-- 
2.39.5