Attachment 55789 Details for Bug 17312 – Bug 17312 - Typo in members-toolbar.inc / moremember-brief.tt / moremember.tt

[patch] Bug 17312 - Typo in members-toolbar.inc / moremember-brief.tt / moremember.tt

Bug-17312---Typo-in-members-toolbarinc--moremember.patch (text/plain), 5.11 KB, created by Chris Cormack on 2016-09-23 20:39:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2016-09-23 20:39:50 UTC

Size: 5.11 KB

patch

obsolete

>From 6123351e1803b3d0182fc9f4c14193c3befa2afe Mon Sep 17 00:00:00 2001
>From: Andreas Roussos <arouss1980@gmail.com>
>Date: Fri, 16 Sep 2016 18:49:19 +0300
>Subject: [PATCH] Bug 17312 - Typo in members-toolbar.inc / moremember-brief.tt
> / moremember.tt
>
>The following three templates are using [% guarantorborrowernumber %]
>while they should be using [% guarantor.borrowernumber %]:
>
>members/members-toolbar.inc
>members/moremember-brief.tt
>members/moremember.tt
>
>This doesn't result in any breakage; just a couple of 'Edit' links that
>do not pass the guarantorid in the URL, and one case where guarantor
>information is not shown in the staff client.
>
>This patch fixes that.
>
>Test plan:
>0) [PREREQUISITE] Create a patron with a guarantor if you don't have one.
>1) Go to Home > Patrons and search for a patron that has a guarantor. In
>   the Details page for that patron, the 'Edit' link in the toolbar does
>   not pass the guarantor's id in the URL (...&guarantorid=&...).
>2) In the same page, the 'Edit' link under the patrons name (immediately
>   under 'Guarantor') again does not include the guarantor id in the URL.
>3) Go to Home > Patrons and click on 'New patron'. Pick any category from
>   the drop down menu. Enter the Surname, First name, and Date of birth
>   of the patron you used in step 1). This triggers the 'Duplicate patron
>   record?' warning -- click on 'View existing record' and notice how the
>   guarantor information is missing.
>4) Apply the patch.
>5) Repeat steps 1), 2), and 3) above. The URLs are fixed and patron info
>   is showing.
>
>Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc        | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt | 4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt       | 4 ++--
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>index cd405e5..b9d97ac 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>@@ -134,7 +134,7 @@ function searchToHold(){
> <div id="toolbar" class="btn-toolbar">
>     [% IF ( CAN_user_borrowers ) %]
>         [% IF ( guarantor ) %]
>-            <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;guarantorid=[% guarantorborrowernumber %]&amp;categorycode=[% categorycode %]">
>+            <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;guarantorid=[% guarantor.borrowernumber %]&amp;categorycode=[% categorycode %]">
>         [% ELSE %]
>             <a id="editpatron" class="btn btn-small" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% borrowernumber %]&amp;categorycode=[% categorycode %]">
>         [% END %]
>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 a2c0b12..b95a4c0 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
>@@ -52,8 +52,8 @@
>             <li><span class="label">Guarantees:</span><ul>[% FOREACH guaranteeloo IN guaranteeloop %]<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guaranteeloo.borrowernumber %]">[% guaranteeloo.name %]  </a></li>[% END %]</ul></li>
>         [% END %]
>     [% ELSE %]
>-        [% IF ( guarantorborrowernumber ) %]
>-            <li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorborrowernumber %]">[% guarantorsurname %], [% guarantorfirstname %]</a></li>
>+        [% IF ( guarantor.borrowernumber ) %]
>+            <li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.surname %], [% guarantor.firstname %]</a></li>
>         [% END %]
>     [% END %]
> 	</ol>
>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 879f094..c5325e1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -272,8 +272,8 @@ function validate1(date) {
> </ol>
> </div>
>       <div class="action">
>-        [% IF ( guarantorborrowernumber ) %]
>-        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=1&amp;guarantorid=[% guarantorborrowernumber %]">Edit</a>
>+        [% IF ( guarantor.borrowernumber ) %]
>+        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=1&amp;guarantorid=[% guarantor.borrowernumber %]">Edit</a>
>         [% ELSE %]
>         <a href="memberentry.pl?op=modify&amp;borrowernumber=[% borrowernumber %]&amp;step=1">Edit</a>
>         [% END %]</div>
>-- 
>2.9.3

Actions: View | Diff | Splinter Review

Attachments on bug 17312: 55631 | 55789 | 55792