Attachment 73890 Details for Bug 18789 – Bug 18789: (follow-up) Pass a Koha::Patron object from returns.pl

[patch] Bug 18789: (follow-up) Pass a Koha::Patron object from returns.pl

Bug-18789-follow-up-Pass-a-KohaPatron-object-from-.patch (text/plain), 2.88 KB, created by Jonathan Druart on 2018-04-09 19:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-04-09 19:00:00 UTC

Size: 2.88 KB

patch

obsolete

>From f7a97d0d98902a179b21c1d797695626465309c6 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>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 @@
>         <caption><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&amp;biblionumber=[% itembiblionumber %]">[% title |html %]</a></caption>
>         <tr>
>             <th>Hold for:</th>
>-            <td>[% name %]</td>
>+            <td>[% INCLUDE 'patron-title.inc' patron=patron %]</td>
>         </tr>
>         </table>
>         <form method="post" action="returns.pl"><input type="submit" value="OK" />
>@@ -368,10 +368,7 @@
>                     [% END %]
>                     <h5>Hold for:</h5>
>                         <li>
>-                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber %]">
>-                                [% patron.surname %], [% patron.firstname %]
>-                            </a>
>-                            ([% patron.cardnumber %])
>+                            [% INCLUDE 'patron-title.inc' patron=patron %]
>                             <span class="patron-category"> - [% patron.category.description %]</span>
>                         </li>
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 18789: 64211 | 64212 | 64213 | 64214 | 64215 | 64216 | 64218 | 64219 | 64221 | 64229 | 71301 | 71302 | 71303 | 71304 | 71305 | 71306 | 71307 | 71308 | 71309 | 71310 | 71311 | 71485 | 71486 | 71487 | 71488 | 71489 | 71490 | 71491 | 71492 | 71493 | 71494 | 71495 | 71496 | 71679 | 71680 | 71681 | 71682 | 71683 | 71684 | 71685 | 71686 | 71687 | 71688 | 71689 | 71690 | 71691 | 71713 | 71714 | 71715 | 71716 | 71717 | 71718 | 71719 | 71720 | 71721 | 71722 | 71723 | 71724 | 71725 | 71726 | 71727 | 71728 | 71729 | 71730 | 71731 | 71732 | 71733 | 71734 | 71735 | 71736 | 71827 | 71838 | 71841 | 73293 | 73890 | 75237