From d3ece3601504e51878b00e49f9911e80b5337ac3 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 16 Jul 2014 15:32:08 -0400 Subject: [PATCH] Bug 4013 [Revised] road type missing on search results On the patron search results page there are several patron fields which do not show: street number, road type, and state. This patch adds them. To test, go to Patrons -> Search patrons and perform a search. In the table of patron search results each patron record should display the correct information including street number, road type, and state. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Works as described, passes tests and QA script. Signed-off-by: Tomas Cohen Arazi Works as described. --- C4/Utils/DataTables/Members.pm | 7 ++++--- .../prog/en/modules/members/tables/members_results.tt | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/C4/Utils/DataTables/Members.pm b/C4/Utils/DataTables/Members.pm index c52007a333..aa0f838bde 100644 --- a/C4/Utils/DataTables/Members.pm +++ b/C4/Utils/DataTables/Members.pm @@ -28,9 +28,10 @@ sub search { my $dbh = C4::Context->dbh; my $select = "SELECT - borrowers.borrowernumber, borrowers.surname, borrowers.firstname, borrowers.address, - borrowers.address2, borrowers.city, borrowers.zipcode, borrowers.country, - cardnumber, borrowers.dateexpiry, + borrowers.borrowernumber, borrowers.surname, borrowers.firstname, + borrowers.streetnumber, borrowers.streettype, borrowers.address, + borrowers.address2, borrowers.city, borrowers.state, borrowers.zipcode, + borrowers.country, cardnumber, borrowers.dateexpiry, borrowers.borrowernotes, borrowers.branchcode, borrowers.email, categories.description AS category_description, categories.category_type, branches.branchname"; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt index aab99401f3..e519289ef1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt @@ -1,3 +1,4 @@ +[% USE AuthorisedValues %] { "sEcho": [% sEcho %], "iTotalRecords": [% iTotalRecords %], @@ -12,7 +13,7 @@ "dt_cardnumber": "[% data.cardnumber %]", "dt_name": - "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]
[% IF ( data.streetnumber ) %][% data.streetnumber %] [% END %][% data.address %][% IF ( data.address2 ) %]
[% data.address2 %][% END %][% IF ( data.city ) %]
[% data.city %][% IF ( data.state ) %],[% END %][% END %][% IF ( data.state ) %] [% data.state %][% END %] [% IF ( data.zipcode ) %] [% data.zipcode %][% END %][% IF ( data.country ) %], [% data.country %][% END %][% IF data.email %]
Email: [% data.email %][% END %]", + "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]
[% IF ( data.streetnumber ) %][% data.streetnumber %] [% END %][% IF ( data.streettype ) %][% AuthorisedValues.GetByCode( 'ROADTYPE', data.streettype ) %] [% END %][% data.address %][% IF ( data.address2 ) %]
[% data.address2 %][% END %][% IF ( data.city || data.state || data.zipcode || data.country) %]
[% END %][% IF ( data.city ) %][% data.city %][% IF ( data.state ) %],[% END %][% END %][% IF ( data.state ) %] [% data.state %][% END %] [% IF ( data.zipcode ) %] [% data.zipcode %][% END %][% IF ( data.country ) %], [% data.country %][% END %][% IF data.email %]
Email: [% data.email %][% END %]", "dt_category": "[% data.category_description |html %] ([% data.category_type |html %])", "dt_branch": -- 2.39.5