Attachment 66156 Details for Bug 19129 – Bug 19129 - Follow-up - Add changes to patron duplicate warning

[patch] Bug 19129 - Follow-up - Add changes to patron duplicate warning

Bug-19129---Follow-up---Add-changes-to-patron-dupl.patch (text/plain), 4.45 KB, created by Katrin Fischer on 2017-08-17 22:21:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2017-08-17 22:21:20 UTC

Size: 4.45 KB

patch

obsolete

>From fbed075b056a27c34c95571b64496b34931e5962 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Fri, 18 Aug 2017 00:14:52 +0200
>Subject: [PATCH] Bug 19129 - Follow-up - Add changes to patron duplicate
> warning
>
>Adds logic from the previous fix to the brief patron summary
>shown when checking a possible patron duplicate.
>
>Bonus: Also fixes missing patron category description there.
>
>To Test:
>- Add 2 patrons
>- Add a patron with the same surname and firstname as an
> existing patron in order to trigger the duplicate message
>- Click "View existing patron"
>- Verify display is correct when existing patron is
> - an organisation
> - not an organisation
>- Verify that the patron category description shows
>---
> .../prog/en/modules/members/moremember-brief.tt | 28 +++++++---------------
> 1 file changed, 9 insertions(+), 19 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
>index b95a4c0..9cf356d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
>@@ -26,27 +26,17 @@
> </div>
> 	<div class="rows">
> 		<ol>
>- [% IF ( I ) %]
>- [% IF ( phonepro ) %]<li>Organization phone: [% phonepro %]</li>[% END %]
>- [% IF ( emailpro ) %]<li>Organization email: [% emailpro %]</li>[% END %]
>- [% ELSE %]
> [% IF ( phone ) %]<li>Primary phone: [% phone %]</li>[% END %]
> [% IF ( phonepro ) %]<li>Secondary phone: [% phonepro %]</li>[% END %]
> [% IF ( mobile ) %]<li>Other phone: [% mobile %]</li>[% END %]
>- [% END %]
>-
>- [% IF ( P ) %]
>- [% IF ( phone ) %]<li>Primary phone: [% phone %]</li>[% END %]
>- [% IF ( mobile ) %]<li>Other phone: [% mobile %]</li>[% END %]
>- [% END %]
>-	[% IF ( fax ) %]<li>Fax: [% fax %]</li>[% END %]
>- [% UNLESS ( I ) %]
>- [% IF ( email ) %]<li class="email">Primary email:<a href="mailto:[% email %]">[% email %]</a></li>[% END %]
>- [% IF ( emailpro ) %]<li class="email">Secondary email: <a href="mailto:[% emailpro %]">[% emailpro %]</a></li>[% END %]
>- [% END %]
>- <li>Initials: [% initials %]</li>
>- <li>Date of birth:[% dateofbirth | $KohaDates %]</li>
>- <li>Gender:[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]</li>[% END %]
>+ [% IF ( fax ) %]<li>Fax: [% fax %]</li>[% END %]
>+ [% IF ( email ) %]<li class="email">Primary email:<a href="mailto:[% email %]">[% email %]</a></li>[% END %]
>+ [% IF ( emailpro ) %]<li class="email">Secondary email: <a href="mailto:[% emailpro %]">[% emailpro %]</a></li>[% END %]
>+ [% UNLESS ( I ) %]
>+ [% IF ( inititals ) %]<li>Initials: [% initials %]</li>[% END %]
>+ [% IF ( dateofbirth ) %]<li>Date of birth:[% dateofbirth | $KohaDates %]</li>[% END %]
>+ [% IF ( sex ) %]<li>Gender:[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]</li>[% END %][% END %]
>+ [% END %]
> [% IF ( isguarantee ) %]
> [% IF ( guaranteeloop ) %]
> <li>Guarantees:<ul>[% FOREACH guaranteeloo IN guaranteeloop %]<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guaranteeloo.borrowernumber %]">[% guaranteeloo.name %] </a></li>[% END %]</ul></li>
>@@ -67,7 +57,7 @@
> 	<ol>
> <li>Card number: [% cardnumber %]</li>
> 	<li>Borrowernumber: [% borrowernumber %]</li>
>- <li>Category: [% description %] ([% categorycode %])</li>
>+ <li>Category: [% categoryname %] ([% categorycode %])</li>
> <li>Registration date: [% dateenrolled | $KohaDates %]</li>
> <li>Expiration date: 
> [% IF ( was_renewed ) %]
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 19129: 66152 | 66153 | 66155 | 66156 | 66257 | 66258 | 66713 | 66714