Bug 17600: Standardize our EXPORT_OK

[srvgit] / admin / add_user_search.pl

diff --git a/admin/add_user_search.pl b/admin/add_user_search.pl
index bafc9e1..032301a 100755 (executable)
--- a/admin/add_user_search.pl
+++ b/admin/add_user_search.pl
@@ -20,13 +20,13 @@
 use Modern::Perl;
 
 use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Branch qw( GetBranches );
-use C4::Category;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
 use C4::Members;
 
-my $input = new CGI;
+use Koha::Patron::Categories;
+
+my $input = CGI->new;
 
 my $dbh = C4::Context->dbh;
 
@@ -34,7 +34,6 @@ my ( $template, $loggedinuser, $cookie, $staff_flags ) = get_template_and_user(
     {   template_name   => "common/patron_search.tt",
         query           => $input,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { acquisition => 'budget_modify'  },
     }
 );
@@ -52,9 +51,7 @@ my $search_patrons_with_acq_perm_only =
     ( $referer =~ m|admin/aqbudgets.pl| )
         ? 1 : 0;
 
-my $onlymine = C4::Branch::onlymine;
-my $branches = C4::Branch::GetBranches( $onlymine );
-
+my $patron_categories = Koha::Patron::Categories->search_with_library_limits;
 $template->param(
     patrons_with_acq_perm_only => $search_patrons_with_acq_perm_only,
     view => ( $input->request_method() eq "GET" ) ? "show_form" : "show_results",
@@ -62,7 +59,7 @@ $template->param(
     json_template => 'acqui/tables/members_results.tt',
     selection_type => $selection_type,
     alphabet        => ( C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' ),
-    categories      => [ C4::Category->all ],
-    branches        => [ map { { branchcode => $_->{branchcode}, branchname => $_->{branchname} } } values %$branches ],
+    categories      => $patron_categories,
+    aaSorting       => 1,
 );
 output_html_with_http_headers( $input, $cookie, $template->output );