From 7c8174e8d63e4a2c83f84cd8f7af2784c0a727fd Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 18 Nov 2021 11:37:24 +0100 Subject: [PATCH] Bug 29396: Make 'Search to hold' work for patron without cardnumber --- catalogue/ISBDdetail.pl | 4 +--- catalogue/MARCdetail.pl | 4 +--- catalogue/detail.pl | 4 +--- catalogue/imageviewer.pl | 6 ++---- catalogue/labeledMARCdetail.pl | 4 +--- catalogue/moredetail.pl | 4 +--- catalogue/search.pl | 4 +--- koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 8 ++++---- .../prog/en/modules/virtualshelves/shelves.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/pages/results.js | 4 ++-- 11 files changed, 16 insertions(+), 30 deletions(-) diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl index d991d3e799a..d54bfe82c2c 100755 --- a/catalogue/ISBDdetail.pl +++ b/catalogue/ISBDdetail.pl @@ -109,9 +109,7 @@ if($query->cookie("holdfor")){ my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); $template->param( holdfor => $query->cookie("holdfor"), - holdfor_surname => $holdfor_patron->surname, - holdfor_firstname => $holdfor_patron->firstname, - holdfor_cardnumber => $holdfor_patron->cardnumber, + holdfor_patron => $holdfor_patron, ); } diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl index 4ff6a03c548..8f7e21bfc7f 100755 --- a/catalogue/MARCdetail.pl +++ b/catalogue/MARCdetail.pl @@ -111,9 +111,7 @@ if($query->cookie("holdfor")){ my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); $template->param( holdfor => $query->cookie("holdfor"), - holdfor_surname => $holdfor_patron->surname, - holdfor_firstname => $holdfor_patron->firstname, - holdfor_cardnumber => $holdfor_patron->cardnumber, + holdfor_patron => $holdfor_patron, ); } diff --git a/catalogue/detail.pl b/catalogue/detail.pl index bc28f29cc11..178a296d56a 100755 --- a/catalogue/detail.pl +++ b/catalogue/detail.pl @@ -104,9 +104,7 @@ if($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, + holdfor_patron => $holdfor_patron, ); } } diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl index e9c43a3935e..1fc1f423048 100755 --- a/catalogue/imageviewer.pl +++ b/catalogue/imageviewer.pl @@ -49,10 +49,8 @@ my @items = GetItemsInfo($biblionumber); if ( $query->cookie("holdfor") ) { my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); $template->param( - holdfor => $query->cookie("holdfor"), - holdfor_surname => $holdfor_patron->surname, - holdfor_firstname => $holdfor_patron->firstname, - holdfor_cardnumber => $holdfor_patron->cardnumber, + holdfor => $query->cookie("holdfor"), + holdfor_patron => $holdfor_patron, ); } diff --git a/catalogue/labeledMARCdetail.pl b/catalogue/labeledMARCdetail.pl index 785c2921542..f6db325554d 100755 --- a/catalogue/labeledMARCdetail.pl +++ b/catalogue/labeledMARCdetail.pl @@ -74,9 +74,7 @@ if($query->cookie("holdfor")){ my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); $template->param( holdfor => $query->cookie("holdfor"), - holdfor_surname => $holdfor_patron->surname, - holdfor_firstname => $holdfor_patron->firstname, - holdfor_cardnumber => $holdfor_patron->cardnumber, + holdfor_patron => $holdfor_patron, ); } diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl index cff2460a278..99f0aad4a7c 100755 --- a/catalogue/moredetail.pl +++ b/catalogue/moredetail.pl @@ -56,9 +56,7 @@ if($query->cookie("holdfor")){ my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); $template->param( holdfor => $query->cookie("holdfor"), - holdfor_surname => $holdfor_patron->surname, - holdfor_firstname => $holdfor_patron->firstname, - holdfor_cardnumber => $holdfor_patron->cardnumber, + holdfor_patron => $holdfor_patron, ); } diff --git a/catalogue/search.pl b/catalogue/search.pl index 5da9c063f3b..84070d6329f 100755 --- a/catalogue/search.pl +++ b/catalogue/search.pl @@ -197,9 +197,7 @@ if($cgi->cookie("holdfor")){ 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, + holdfor_patron => $holdfor_patron, ); } } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc index e194411af5d..e2811702d9b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -180,7 +180,7 @@ [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt index 4115ddacf7a..b7733e36e63 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -146,9 +146,9 @@