From 706badc28917cac3ccb8d5acd666e55e481644ce Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 26 Apr 2021 11:10:11 +0200 Subject: [PATCH] Bug 28213: Prevent crash if patron or club deleted after search to hold Deleting a patron or patron club causes server error on searching. To recreate: - create a club template - create a club - enroll a patron in the club - from the clubs page, select Search To Hold for your club - do a search, see that it says "Hold for [club name]" in your search results page - go back to the clubs page and delete your club - try to perform a search => Without this patch you get "Can't call method "name" on an undefined value at /kohadevbox/koha/catalogue/search.pl line 207" Same when placing a hold for a patron (check the search result and the detail pages) Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit 0633590f55b2dcf0c515e50469b034e563819ced) Signed-off-by: Fridolin Somers (cherry picked from commit f307bc2786ddd1a31d09a52913a047b04ac2bed3) Signed-off-by: Andrew Fuerste-Henry --- catalogue/detail.pl | 18 ++++++++++-------- catalogue/search.pl | 24 ++++++++++++++---------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/catalogue/detail.pl b/catalogue/detail.pl index de754d2a2c..d9af434995 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -90,15 +90,17 @@ if ( not defined $record ) { eval { $biblio->metadata->record }; $template->param( decoding_error => $@ ); -if($query->cookie("holdfor")){ +if($query->cookie("holdfor")){ my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); - $template->param( - # FIXME Should pass the patron object - holdfor => $query->cookie("holdfor"), - holdfor_surname => $holdfor_patron->surname, - holdfor_firstname => $holdfor_patron->firstname, - holdfor_cardnumber => $holdfor_patron->cardnumber, - ); + if ( $holdfor_patron ) { + $template->param( + # FIXME Should pass the patron object + holdfor => $query->cookie("holdfor"), + holdfor_surname => $holdfor_patron->surname, + holdfor_firstname => $holdfor_patron->firstname, + holdfor_cardnumber => $holdfor_patron->cardnumber, + ); + } } if($query->cookie("searchToOrder")){ diff --git a/catalogue/search.pl b/catalogue/search.pl index 9b37755983..9301416f85 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -194,20 +194,24 @@ if (C4::Context->preference("marcflavour") eq "UNIMARC" ) { if($cgi->cookie("holdfor")){ my $holdfor_patron = Koha::Patrons->find( $cgi->cookie("holdfor") ); - $template->param( - holdfor => $cgi->cookie("holdfor"), - holdfor_surname => $holdfor_patron->surname, - holdfor_firstname => $holdfor_patron->firstname, - holdfor_cardnumber => $holdfor_patron->cardnumber, - ); + if ( $holdfor_patron ) { # may have been deleted in the meanwhile + $template->param( + holdfor => $cgi->cookie("holdfor"), + holdfor_surname => $holdfor_patron->surname, + holdfor_firstname => $holdfor_patron->firstname, + holdfor_cardnumber => $holdfor_patron->cardnumber, + ); + } } if($cgi->cookie("holdforclub")){ my $holdfor_club = Koha::Clubs->find( $cgi->cookie("holdforclub") ); - $template->param( - holdforclub => $cgi->cookie("holdforclub"), - holdforclub_name => $holdfor_club->name, - ); + if ( $holdfor_club ) { # May have been deleted in the meanwhile + $template->param( + holdforclub => $cgi->cookie("holdforclub"), + holdforclub_name => $holdfor_club->name, + ); + } } if($cgi->cookie("searchToOrder")){ -- 2.39.5