From 55a148b1a0e327a7b9122b8ef03203619f7716bc Mon Sep 17 00:00:00 2001 From: Julian Maurice Date: Tue, 10 Jan 2017 13:20:02 +0100 Subject: [PATCH] Bug 11999: Remove 'alreadyReserved' check in CanBookBeReserved Since bug 14695 it is possible to reserve more than one item per biblio Also fix bad use of $item --- C4/Reserves.pm | 6 ------ t/db_dependent/Holds.t | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index dd76abdcc8..f735dcdd6e 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -274,14 +274,8 @@ See CanItemBeReserved() for possible return values. sub CanBookBeReserved{ my ($borrowernumber, $biblionumber, $pickup_branchcode) = @_; - # Check if borrower already has reserved the same biblio. my $patron = Koha::Patrons->find($borrowernumber); my $holds = $patron->holds; - while (my $hold = $holds->next) { - if ($hold->biblionumber == $biblionumber) { - return { status => 'alreadyReserved' }; - } - } # Check if borrower has reached the maximum number of holds allowed my $maxreserves = C4::Context->preference('maxreserves'); diff --git a/t/db_dependent/Holds.t b/t/db_dependent/Holds.t index a5d9aa42ac..97e78054b8 100755 --- a/t/db_dependent/Holds.t +++ b/t/db_dependent/Holds.t @@ -369,7 +369,7 @@ is( is(CanBookBeReserved($borrowernumbers[0], $bibnum), 'OK'); C4::Context->set_preference('maxreserves', 1); -ok(CanBookBeReserved($borrowernumbers[0], $biblionumber) eq 'tooManyReserves'); +is(CanBookBeReserved($borrowernumbers[0], $biblionumber), 'tooManyReserves'); C4::Context->set_preference('maxreserves', 0); t::lib::Mocks::mock_preference('IndependentBranches', 1); -- 2.11.0