From 3d0012e8fe98b910aace7da628c576fc1ba303ab Mon Sep 17 00:00:00 2001 From: Andreas Roussos Date: Fri, 16 Sep 2016 18:49:19 +0300 Subject: [PATCH] Bug 17312 - Typo in members-toolbar.inc / moremember-brief.tt / moremember.tt MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall (cherry picked from commit 0f4644a5bf7a43b117fbf6642b6db0479fdc58ed) Signed-off-by: Frédéric Demians --- koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc | 2 +- .../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 b7e7178f0a..1a047967e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc @@ -137,7 +137,7 @@ function searchToHold(){
[% IF ( CAN_user_borrowers ) %] [% IF ( guarantor ) %] - + [% ELSE %] [% 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 a2c0b12231..b95a4c050d 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 @@
  • Guarantees:
    • [% END %] [% ELSE %] - [% IF ( guarantorborrowernumber ) %] -
  • Guarantor:[% guarantorsurname %], [% guarantorfirstname %]
    • + [% IF ( guarantor.borrowernumber ) %] +
  • Guarantor:[% guarantor.surname %], [% guarantor.firstname %]
    • [% END %] [% END %] 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 8d740b8fb6..72b3fd5aa6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -269,8 +269,8 @@ function validate1(date) {
    - [% IF ( guarantorborrowernumber ) %] - Edit + [% IF ( guarantor.borrowernumber ) %] + Edit [% ELSE %] Edit [% END %]
    -- 2.20.1