From 2b39823c0f4cec1607078de1f2547afc95ae87cd Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 26 Dec 2014 10:22:34 +0100 Subject: [PATCH] Bug 13458: Display the correct patron categories Bug 9811 removes useful code. Actually the AddPatronLists pref is not sent to the template from members/member.pl. To fix this issue, we can use the existing not clean way, or compare the syspref value directly in the template. This second solution is implemented in this patch. Test plan: 1/ Set the AddPatronLists pref to 'specific' 2/ On the patron home page (members/members-home/pl), the patron search result page (members/member.pl after launching a search) and on the checkouts page/patron search result (circ/circulation.pl after searching a patron using the check out), verify that the patron category list is the specific ones. 3/ Test there are no regression with the AddPatronLists pref set to 'general'. Signed-off-by: Chris Cormack Signed-off-by: Katrin Fischer Works as described and fixes the problem. Note: I am not sure if AddPatronLists makes sense - if you set it to general patron types, it still preselects the wrong category type (tried organization, a child patron category was selected). Also the name is confusiong nowadays with the Patron list feature. Signed-off-by: Tomas Cohen Arazi --- circ/circulation.pl | 3 --- koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc | 2 +- members/members-home.pl | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 6e9f449292..50936d7f3d 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -207,9 +207,6 @@ my $message; if ($findborrower) { my $borrowers = Search($findborrower, 'cardnumber') || []; if (C4::Context->preference("AddPatronLists")) { - $template->param( - "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1", - ); if (C4::Context->preference("AddPatronLists")=~/code/){ my $categories = GetBorrowercategoryList; $categories->[0]->{'first'} = 1; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc index 8d36da3b31..f67f64cfeb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc @@ -3,7 +3,7 @@