Bugzilla – Attachment 77728 Details for
Bug 21208
Housebound deliverer/chooser have wrong name when creating a visit
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21208: Fix housebound deliverer/chooser names
Bug-21208-Fix-housebound-delivererchooser-names.patch (text/plain), 7.26 KB, created by
Katrin Fischer
on 2018-08-12 15:42:51 UTC
(
hide
)
Description:
Bug 21208: Fix housebound deliverer/chooser names
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2018-08-12 15:42:51 UTC
Size:
7.26 KB
patch
obsolete
>From 026d12225d9f901e0a0e11f7c4f1de41ad163516 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >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 <katrin.fischer.83@web.de> >--- > .../intranet-tmpl/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 e28d35c..2f6c2e3 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 ) %] > <option value="[% chooser.borrowernumber %]" selected="selected"> >- [% INCLUDE 'patron-title.inc' borrowernumber = chooser.borrowernumber category_type = chooser.categorycode firstname = chooser.firstname surname = chooser.surname othernames = chooser.othernames cardnumber = chooser.cardnumber invert_name = 0 %] >+ [% INCLUDE 'patron-title.inc' patron = chooser invert_name = 0 %] > </option> > [% ELSE %] > <option value="[% chooser.borrowernumber %]"> >- [% INCLUDE 'patron-title.inc' borrowernumber = chooser.borrowernumber category_type = chooser.categorycode firstname = chooser.firstname surname = chooser.surname othernames = chooser.othernames cardnumber = chooser.cardnumber invert_name = 0 %] >+ [% INCLUDE 'patron-title.inc' patron = chooser invert_name = 0 %] > </option> > [% END %] > [% END %] > [% ELSE %] > [% FOREACH chooser IN choosers %] > <option value="[% chooser.borrowernumber %]"> >- [% INCLUDE 'patron-title.inc' borrowernumber = chooser.borrowernumber category_type = chooser.categorycode firstname = chooser.firstname surname = chooser.surname othernames = chooser.othernames cardnumber = chooser.cardnumber invert_name = 0 %] >+ [% INCLUDE 'patron-title.inc' patron = chooser invert_name = 0 %] > </option> > [% END %] > [% END %] >@@ -293,18 +293,18 @@ > [% FOREACH deliverer IN deliverers %] > [% IF ( visit.deliverer_brwnumber == deliverer.borrowernumber ) %] > <option value="[% deliverer.borrowernumber %]" selected="selected"> >- [% INCLUDE 'patron-title.inc' borrowernumber = deliverer.borrowernumber category_type = deliverer.categorycode firstname = deliverer.firstname surname = deliverer.surname othernames = deliverer.othernames cardnumber = deliverer.cardnumber invert_name = 0 %] >+ [% INCLUDE 'patron-title.inc' patron = deliverer invert_name = 0 %] > </option> > [% ELSE %] > <option value="[% deliverer.borrowernumber %]"> >- [% INCLUDE 'patron-title.inc' borrowernumber = deliverer.borrowernumber category_type = deliverer.categorycode firstname = deliverer.firstname surname = deliverer.surname othernames = deliverer.othernames cardnumber = deliverer.cardnumber invert_name = 0 %] >+ [% INCLUDE 'patron-title.inc' patron = deliverer invert_name = 0 %] > </option> > [% END %] > [% END %] > [% ELSE %] > [% FOREACH deliverer IN deliverers %] > <option value="[% deliverer.borrowernumber %]"> >- [% INCLUDE 'patron-title.inc' borrowernumber = deliverer.borrowernumber category_type = deliverer.categorycode firstname = deliverer.firstname surname = deliverer.surname othernames = deliverer.othernames cardnumber = deliverer.cardnumber invert_name = 0 %] >+ [% INCLUDE 'patron-title.inc' patron = deliverer invert_name = 0 %] > </option> > [% END %] > [% END %] >@@ -390,12 +390,12 @@ > <td>[% entry.appointment_date | $KohaDates %] ([% entry.day_segment %])</td> > <td> > <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.chooser.borrowernumber %]"> >- [% 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 %] > </a> > </td> > <td> > <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% entry.deliverer.borrowernumber %]"> >- [% 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 %] > </a> > </td> > <td class="actions"> >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21208
:
77717
| 77728