@@ -, +, @@ (othername) surname (cardnumber)' "Place hold for 'firstname (othername) surname'" and "Forget 'firstname (othername) surname'" button and note the dropdown includes "Place hold for 'firstname (othername) surname'" --- catalogue/ISBDdetail.pl | 5 ++--- catalogue/MARCdetail.pl | 5 ++--- catalogue/detail.pl | 4 +--- catalogue/imageviewer.pl | 3 +-- catalogue/labeledMARCdetail.pl | 5 ++--- catalogue/moredetail.pl | 5 ++--- catalogue/search.pl | 5 ++--- koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/results.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 2 +- 10 files changed, 17 insertions(+), 25 deletions(-) --- a/catalogue/ISBDdetail.pl +++ a/catalogue/ISBDdetail.pl @@ -108,9 +108,8 @@ my $res = GetISBDView({ 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 => $query->cookie("holdfor"), + holdfor_patron => $holdfor_patron, holdfor_cardnumber => $holdfor_patron->cardnumber, ); } --- a/catalogue/MARCdetail.pl +++ a/catalogue/MARCdetail.pl @@ -110,9 +110,8 @@ my $biblio = GetBiblioData($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 => $query->cookie("holdfor"), + holdfor_patron => $holdfor_patron, holdfor_cardnumber => $holdfor_patron->cardnumber, ); } --- a/catalogue/detail.pl +++ a/catalogue/detail.pl @@ -103,10 +103,8 @@ if($query->cookie("holdfor")){ my $holdfor_patron = Koha::Patrons->find( $query->cookie("holdfor") ); 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_patron => $holdfor_patron, holdfor_cardnumber => $holdfor_patron->cardnumber, ); } --- a/catalogue/imageviewer.pl +++ a/catalogue/imageviewer.pl @@ -50,8 +50,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_patron => $holdfor_patron, holdfor_cardnumber => $holdfor_patron->cardnumber, ); } --- a/catalogue/labeledMARCdetail.pl +++ a/catalogue/labeledMARCdetail.pl @@ -73,9 +73,8 @@ my $biblio = GetBiblioData($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 => $query->cookie("holdfor"), + holdfor_patron => $holdfor_patron, holdfor_cardnumber => $holdfor_patron->cardnumber, ); } --- a/catalogue/moredetail.pl +++ a/catalogue/moredetail.pl @@ -55,9 +55,8 @@ $template->param( 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 => $query->cookie("holdfor"), + holdfor_patron => $holdfor_patron, holdfor_cardnumber => $holdfor_patron->cardnumber, ); } --- a/catalogue/search.pl +++ a/catalogue/search.pl @@ -203,9 +203,8 @@ if($cgi->cookie("holdfor")){ my $holdfor_patron = Koha::Patrons->find( $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 => $cgi->cookie("holdfor"), + holdfor_patron => $holdfor_patron, holdfor_cardnumber => $holdfor_patron->cardnumber, ); } --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc @@ -182,7 +182,7 @@ [% ELSE %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt @@ -143,9 +143,9 @@