Bugzilla – Attachment 122735 Details for
Bug 28644
Can't call method "borrowernumber" on an undefined value at C4/Reserves.pm line 607
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28644: Fix calling borrowernumber on undefined value
Bug-28644-Fix-calling-borrowernumber-on-undefined-.patch (text/plain), 2.06 KB, created by
Nick Clemens (kidclamp)
on 2021-07-09 12:20:28 UTC
(
hide
)
Description:
Bug 28644: Fix calling borrowernumber on undefined value
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2021-07-09 12:20:28 UTC
Size:
2.06 KB
patch
obsolete
>From cefe1ba2c9d4e101528b1d609ae6a85758f49673 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Thu, 1 Jul 2021 14:13:05 +0000 >Subject: [PATCH] Bug 28644: Fix calling borrowernumber on undefined value > >If the hold is not found (e.g. already cancelled), we should >return earlier without crashing: > Can't call method "borrowernumber" on an undefined value at /usr/share/koha/C4/Reserves.pm line 521 > (Note: line number from 19.11) > >Test plan: >Run t/db_dependent/Reserves.t >Add a hold, go to user menu with holds in OPAC. >At the same time, cancel this hold from staff. >Now click the Cancel in OPAC. > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > C4/Reserves.pm | 2 +- > t/db_dependent/Reserves.t | 5 ++++- > 2 files changed, 5 insertions(+), 2 deletions(-) > >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index 83222dc1c5..dfd0c70568 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -602,7 +602,7 @@ sub CanReserveBeCanceledFromOpac { > my ($reserve_id, $borrowernumber) = @_; > > return unless $reserve_id and $borrowernumber; >- my $reserve = Koha::Holds->find($reserve_id); >+ my $reserve = Koha::Holds->find($reserve_id) or return; > > return 0 unless $reserve->borrowernumber == $borrowernumber; > return $reserve->is_cancelable_from_opac; >diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t >index 9f408629d9..93e1799191 100755 >--- a/t/db_dependent/Reserves.t >+++ b/t/db_dependent/Reserves.t >@@ -17,7 +17,7 @@ > > use Modern::Perl; > >-use Test::More tests => 67; >+use Test::More tests => 68; > use Test::MockModule; > use Test::Warn; > >@@ -555,6 +555,9 @@ $cancancel = CanReserveBeCanceledFromOpac($canres->{reserve_id}, $requesters{$br > is($cancancel, 0, 'Reserve in transfer status cant be canceled'); > > $dbh->do('DELETE FROM reserves', undef, ($bibnum)); >+is( CanReserveBeCanceledFromOpac($canres->{resserve_id}, $requesters{$branch_1}), undef, >+ 'Cannot cancel a deleted hold' ); >+ > AddReserve( > { > branchcode => $branch_1, >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 28644
:
122518
| 122735 |
124571