From f7a97d0d98902a179b21c1d797695626465309c6 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 9 Apr 2018 15:59:32 -0300 Subject: [PATCH] Bug 18789: (follow-up) Pass a Koha::Patron object from returns.pl --- circ/returns.pl | 4 +--- koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/circ/returns.pl b/circ/returns.pl index 162f8fdfc5..9d04dc1ff5 100755 --- a/circ/returns.pl +++ b/circ/returns.pl @@ -399,7 +399,6 @@ if ( $messages->{'WrongTransfer'} and not $messages->{'WasTransfered'}) { my $patron = Koha::Patrons->find( $reserve->{'borrowernumber'} ); my $name = $patron->surname . ", " . $patron->title . " " . $patron->firstname; $template->param( - wname => $name, patron => $patron, ); } @@ -433,10 +432,9 @@ if ( $messages->{'ResFound'}) { $template->param( # FIXME The full patron object should be passed to the template found => 1, - name => $patron->surname . ", " . $patron->title . " " . $patron->firstname, + patron => $patron, barcode => $barcode, destbranch => $reserve->{'branchcode'}, - borrowernumber => $reserve->{'borrowernumber'}, itemnumber => $reserve->{'itemnumber'}, reservenotes => $reserve->{'reservenotes'}, reserve_id => $reserve->{reserve_id}, diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index f18ea69023..ab0247382c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -326,7 +326,7 @@ [% title |html %] Hold for: - [% name %] + [% INCLUDE 'patron-title.inc' patron=patron %]
@@ -368,10 +368,7 @@ [% END %]
Hold for:
  • - - [% patron.surname %], [% patron.firstname %] - - ([% patron.cardnumber %]) + [% INCLUDE 'patron-title.inc' patron=patron %] - [% patron.category.description %]
  • -- 2.11.0