Browse Source

Bug 20443: Use search_with_library_limits for attribute types

Dealt with that previously in the module during the rebase.
It conflicted with bug 23281.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
20.05.x
Jonathan Druart 2 years ago
committed by Martin Renvoize
parent
commit
7e1be8d385
Signed by: martin.renvoize GPG Key ID: 422B469130441A0F
  1. 6
      C4/Auth_with_ldap.pm
  2. 3
      members/memberentry.pl
  3. 3
      members/moremember.pl
  4. 3
      reports/borrowers_stats.pl
  5. 3
      reports/issues_stats.pl
  6. 3
      tools/modborrowers.pl

6
C4/Auth_with_ldap.pm

@ -231,7 +231,8 @@ sub checkpw_ldap {
return 0; # B2, D2
}
if (C4::Context->preference('ExtendedPatronAttributes') && $borrowernumber && ($config{update} ||$config{replicate})) {
my $attribute_types = Koha::Patron::Attribute::Types->filter_by_branch_limitations;
my $library_id = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
my $attribute_types = Koha::Patron::Attribute::Types->search_with_library_limits({}, {}, $library_id);
while ( my $attribute_type = $attribute_types->next ) {
my $code = $attribute_type->code;
unless (exists($borrower{$code}) && $borrower{$code} !~ m/^\s*$/ ) {
@ -374,7 +375,8 @@ sub update_local {
# skip extended patron attributes in 'borrowers' attribute update
my @keys = keys %$borrower;
if (C4::Context->preference('ExtendedPatronAttributes')) {
my $attribute_types = Koha::Patron::Attribute::Types->filter_by_branch_limitations;
my $library_id = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
my $attribute_types = Koha::Patron::Attribute::Types->search_with_library_limits({}, {}, $library_id);
while ( my $attribute_type = $attribute_types->next ) {
my $code = $attribute_type->code;
@keys = grep { $_ ne $code } @keys;

3
members/memberentry.pl

@ -866,7 +866,8 @@ sub patron_attributes_form {
my $borrowernumber = shift;
my $op = shift;
my $attribute_types = Koha::Patron::Attribute::Types->filter_by_branch_limitations;
my $library_id = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
my $attribute_types = Koha::Patron::Attribute::Types->search_with_library_limits({}, {}, $library_id);
if ( $attribute_types->count == 0 ) {
$template->param(no_patron_attribute_types => 1);
return;

3
members/moremember.pl

@ -154,7 +154,8 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
attributes_loop => \@attributes_loop
);
my $nb_of_attribute_types = Koha::Patron::Attribute::Types->filter_by_branch_limitations->count;
my $library_id = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
my $nb_of_attribute_types = Koha::Patron::Attribute::Types->search_with_library_limits({}, {}, $library_id)->count;
if ( $nb_of_attribute_types == 0 ) {
$template->param(no_patron_attribute_types => 1);
}

3
reports/borrowers_stats.pl

@ -495,7 +495,8 @@ sub parse_extended_patron_attributes {
sub patron_attributes_form {
my $template = shift;
my $attribute_types = Koha::Patron::Attribute::Types->filter_by_branch_limitations;
my $library_id = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
my $attribute_types = Koha::Patron::Attribute::Types->search_with_library_limits({}, {}, $library_id);
my %items_by_class;
while ( my $attr_type = $attribute_types->next ) {

3
reports/issues_stats.pl

@ -166,7 +166,8 @@ foreach (sort {$ccodes->{$a} cmp $ccodes->{$b}} keys %$ccodes) {
my $CGIextChoice = ( 'CSV' ); # FIXME translation
my $CGIsepChoice=GetDelimiterChoices;
my $attribute_types = Koha::Patron::Attribute::Types->filter_by_branch_limitations;
my $library_id = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
my $attribute_types = Koha::Patron::Attribute::Types->search_with_library_limits({}, {}, $library_id);
my %attribute_types_by_class;
while ( my ( $attribute_type ) = $attribute_types->next ) {
$attribute_type = $attribute_type->unblessed;

3
tools/modborrowers.pl

@ -113,7 +113,8 @@ if ( $op eq 'show' ) {
# Construct the patron attributes list
my @patron_attributes_values;
my @patron_attributes_codes;
my $patron_attribute_types = Koha::Patron::Attribute::Types->filter_by_branch_limitations;
my $library_id = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
my $patron_attribute_types = Koha::Patron::Attribute::Types->search_with_library_limits({}, {}, $library_id);
my @patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
while ( my $attr_type = $patron_attribute_types->next ) {
# TODO Repeatable attributes are not correctly managed and can cause data lost.

Loading…
Cancel
Save