From 9d4e5e4f79d1dfe7ba48a2e0f31cc60f6169d997 Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Mon, 19 Mar 2018 09:27:07 +0000 Subject: [PATCH] Bug 20444: Use Koha::Patron::Attribute::Types object for getting patron attributes in letter.pl Test plan: 0) Apply the patch 1) Do not have any patron attribute types defined 2) Go to Tools -> Notices and slips 3) Edit any slip/letter which uses table borrower 4) Confirm the editing works, and the slip/letter itself works 5) Add some patron attributes types and define them a value for any patron 6) Go to Tools -> Notices and slips and edit any slip/letter which uses table borrower 7) Confirm, the attributes are listed in available fields 8) Confirm the slip/letter is working when you add a attribute to it --- tools/letter.pl | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/letter.pl b/tools/letter.pl index 92615a5..5f90149 100755 --- a/tools/letter.pl +++ b/tools/letter.pl @@ -46,7 +46,8 @@ use C4::Auth; use C4::Context; use C4::Output; use C4::Letters; -use C4::Members::Attributes; + +use Koha::Patron::Attribute::Types; # $protected_letters = protected_letters() # - return a hashref of letter_codes representing letters that should never be deleted @@ -466,12 +467,14 @@ sub get_columns_for { } } if ($table eq 'borrowers') { - if ( my $attributes = C4::Members::Attributes::GetAttributes() ) { - foreach (@$attributes) { - push @fields, { - value => "borrower-attribute:$_", - text => "attribute:$_", - } + my $attribute_types = Koha::Patron::Attribute::Types->search( + {}, + { order_by => 'code' }, + ); + while ( my $at = $attribute_types->next ) { + push @fields, { + value => "borrower-attribute:" . $at->code, + text => "attribute:" . $at->code, } } } -- 2.1.4