From 647f451e495cd37aed0b50037441a5f7cb1a4981 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 10 Aug 2018 17:39:09 -0300 Subject: [PATCH] Bug 21208: Fix housebound deliverer/chooser names When creating a housebound visit, the names of the chooser and deliverer are the same as the housebound patron (even though the housebound patron does not have chooser and deliverer roles). It has been caused by: commit 5f80977875ff124d411f2cd89de4a944fa9c27af Bug 18403: Use patron-title.inc when hidepatronname is used patron-title.inc now starts looking for a variable named "patron", which exists in members/housebound. A better fix could be to renamed this "patron" variable tested by patron-title.inc, but at first glance it's the only place this issue exists. Test plan: 1- Make sure HouseboundModule is enabled in system preferences 2- Go to a patron file (Patron A) 3- Edit this patron's housebound roles to Chooser 4- Go to another patron file (Patron B) 5- Edit this patron's housebound roles to Deliverer 6- Go to a third patron's file (Patron C) 7- Go to the Housebound tab 8- Fill out the housebound profile for Patron c 9- Click on "Add a new delivery" 10- Fill out day and time 11- Check the Chooser drop down 12- Check the Deliverer drop down 13- Save the delivery 14- Notice the Chooser and Deliverer names are correct 15- Click on the name of the Chooser, it goes to Patron A's file 16- Go back and click on the name of the Deliverer, it goes to Patron B's file Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit cacb57689070315fd1fae176e3761abc6870107f) Signed-off-by: Martin Renvoize --- .../prog/en/modules/members/housebound.tt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt index e28d35c689..2f6c2e34ce 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -267,18 +267,18 @@ [% FOREACH chooser IN choosers %] [% IF ( visit.chooser_brwnumber == chooser.borrowernumber ) %] [% ELSE %] [% END %] [% END %] [% ELSE %] [% FOREACH chooser IN choosers %] [% END %] [% END %] @@ -293,18 +293,18 @@ [% FOREACH deliverer IN deliverers %] [% IF ( visit.deliverer_brwnumber == deliverer.borrowernumber ) %] [% ELSE %] [% END %] [% END %] [% ELSE %] [% FOREACH deliverer IN deliverers %] [% END %] [% END %] @@ -390,12 +390,12 @@ [% entry.appointment_date | $KohaDates %] ([% entry.day_segment %]) - [% INCLUDE 'patron-title.inc' borrowernumber = entry.chooser.borrowernumber category_type = entry.chooser.categorycode firstname = entry.chooser.firstname surname = entry.chooser.surname othernames = entry.chooser.othernames cardnumber = entry.chooser.cardnumber invert_name = 0 %] + [% INCLUDE 'patron-title.inc' patron = entry.chooser invert_name = 0 %] - [% INCLUDE 'patron-title.inc' borrowernumber = entry.deliverer.borrowernumber category_type = entry.deliverer.categorycode firstname = entry.deliverer.firstname surname = entry.deliverer.surname othernames = entry.deliverer.othernames cardnumber = entry.deliverer.cardnumber invert_name = 0 %] + [% INCLUDE 'patron-title.inc' patron = entry.deliverer invert_name = 0 %] -- 2.39.5