Attachment 49848 Details for Bug 15928 – Bug 15928 - Show unlinked guarantor

[patch] Bug 15928 - Show unlinked guarantor

Bug-15928---Show-unlinked-guarantor.patch (text/plain), 2.53 KB, created by Jonathan Druart on 2016-04-04 11:45:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-04-04 11:45:21 UTC

Size: 2.53 KB

patch

obsolete

>From 20c92cf333b27cb376215c733fe995e8c9dd9d05 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Fri, 26 Feb 2016 21:08:55 +0000
>Subject: [PATCH] Bug 15928 - Show unlinked guarantor
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>To test:
>1 - Add guarantor data to patron account by typing it in but do not 'Set to patron'
>2 - Note it is not displayed on patron details
>3 - Apply patch
>4 - Note the info is displayed
>5 - Test that linked guarantors show as expected
>
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Amended-patch: Correct some indents/spaces
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 6 +++++-
> members/moremember.pl                                         | 7 +++++++
> 2 files changed, 12 insertions(+), 1 deletion(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index 8355bf5..6a4add0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -246,7 +246,11 @@ function validate1(date) {
>     [% ELSIF guarantor %]
>         <li>
>             <span class="label">Guarantor:</span>
>-            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.firstname %] [% guarantor.surname %]</a>
>+            [% IF guarantor.borrowernumber %]
>+                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.firstname %] [% guarantor.surname %]</a>
>+            [% ELSE %]
>+                [% guarantor.firstname %] [% guarantor.surname %]
>+            [% END %]
>         </li>
>     [% END %]
> </ol>
>diff --git a/members/moremember.pl b/members/moremember.pl
>index 4a5c06d..7c962a4 100755
>--- a/members/moremember.pl
>+++ b/members/moremember.pl
>@@ -169,6 +169,13 @@ if ( my $guarantor = $patron->guarantor ) {
>     $template->param( guarantor => $guarantor );
>     push @relatives, $guarantor->borrowernumber;
>     push @relatives, $_->borrowernumber for $patron->siblings;
>+} elsif ( $patron->contactname || $patron->contactfirstname ) {
>+    $template->param(
>+        guarantor => {
>+            firstname => $patron->contactfirstname,
>+            surname   => $patron->contactname,
>+        }
>+    );
> } else {
>     my @guarantees = $patron->guarantees;
>     $template->param( guarantees => \@guarantees );
>-- 
>2.7.0

Actions: View | Diff | Splinter Review

Attachments on bug 15928: 48414 | 49598 | 49599 | 49848 | 50234