From f1830f9e4fef8b592d9dcab3efc595b0a604c8bf Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 6 May 2019 11:02:03 -0500 Subject: [PATCH] Bug 22529: Use new C4::Auth::haspermission from svc/members/search The svc/members/search script can be used to retrieve patrons with a specific permission. This feature is only used once, to link patrons to funds. The code in the script is duplicated from what we have in C4::Auth::haspermission, and it makes sense to clean it. Test plan: Create a fund and add users to this fund. When you search for users you must only have a list of patrons with the acquisition.order_manage permission. --- svc/members/search | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/svc/members/search b/svc/members/search index abb57164ce..9c83fc206f 100755 --- a/svc/members/search +++ b/svc/members/search @@ -91,19 +91,8 @@ if ($has_permission) { my ( $permission, $subpermission ) = split /\./, $has_permission; my @patrons_with_permission; for my $patron ( @{ $results->{patrons} } ) { - my $perms = haspermission( $patron->{userid}, undef ); - if ( $perms->{superlibrarian} == 1 - or $perms->{$permission} == 1 ) - { - push @patrons_with_permission, $patron; - next; - } - - if ($subpermission) { - my $subperms = get_user_subpermissions( $patron->{userid} ); - push @patrons_with_permission, $patron - if $subperms->{$permission}->{$subpermission}; - } + push @patrons_with_permission, $patron + if haspermission( $patron->{userid}, { $permission => $subpermission } ); } $results->{patrons} = \@patrons_with_permission; $results->{iTotalDisplayRecords} = scalar( @patrons_with_permission ); -- 2.11.0