Bug 23271: Replace search_limited with search_with_library_limits

[srvgit] / members / routing-lists.pl

diff --git a/members/routing-lists.pl b/members/routing-lists.pl
index 2f3c4ac..dee5845 100755 (executable)
--- a/members/routing-lists.pl
+++ b/members/routing-lists.pl
@@ -17,26 +17,23 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
 use CGI qw ( -utf8 );
 use C4::Output;
 use C4::Auth qw/:DEFAULT/;
 use C4::Members;
-use C4::Members::Attributes qw(GetBorrowerAttributes);
 use C4::Context;
 use C4::Serials;
 use Koha::Patrons;
 use CGI::Session;
 
-my $query = new CGI;
+my $query = CGI->new;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
     {
         template_name   => 'members/routing-lists.tt',
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { circulate => 'circulate_remaining_permissions' },
     }
 );
@@ -48,58 +45,15 @@ my $borrowernumber = $query->param('borrowernumber');
 
 my $branch = C4::Context->userenv->{'branch'};
 
-# get the borrower information.....
-my ( $patron, $patron_info );
-if ($borrowernumber) {
-    $patron = Koha::Patrons->find( $borrowernumber );
-    my $category = $patron->category;
-    my $patron_info = $patron->unblessed;
-    $patron_info->{description} = $category->description;
-    $patron_info->{category_type} = $category->category_type;
-
-  my $count;
-  my @borrowerSubscriptions;
-  ($count, @borrowerSubscriptions) = GetSubscriptionsFromBorrower($borrowernumber );
-  my @subscripLoop;
-
-    foreach my $num_res (@borrowerSubscriptions) {
-        my %getSubscrip;
-        $getSubscrip{subscriptionid}   = $num_res->{'subscriptionid'};
-        $getSubscrip{title}                    = $num_res->{'title'};
-        $getSubscrip{borrowernumber}           = $num_res->{'borrowernumber'};
-        push( @subscripLoop, \%getSubscrip );
-    }
-
-    $template->param(
-        countSubscrip => scalar @subscripLoop,
-        subscripLoop  => \@subscripLoop,
-        routinglistview => 1
-    );
-
-    $template->param( adultborrower => 1 ) if ( $patron_info->{category_type} =~ /^(A|I)$/ );
-}
-
-##################################################################################
-
-$template->param(%$patron_info);
+my $logged_in_user = Koha::Patrons->find( $loggedinuser );
+my $patron         = Koha::Patrons->find( $borrowernumber );
+output_and_exit_if_error( $query, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
 $template->param(
+    patron            => $patron,
     findborrower      => $findborrower,
-    borrower          => $patron_info,
-    borrowernumber    => $borrowernumber,
-    branch            => $branch,
-    categoryname      => $patron_info->{description},
-    RoutingSerials    => C4::Context->preference('RoutingSerials'),
+    branch            => $branch, # FIXME This is confusing
+    routinglistview   => 1,
 );
 
-if (C4::Context->preference('ExtendedPatronAttributes')) {
-    my $attributes = GetBorrowerAttributes($borrowernumber);
-    $template->param(
-        ExtendedPatronAttributes => 1,
-        extendedattributes => $attributes
-    );
-}
-
-$template->param( picture => 1 ) if $patron and $patron->image;
-
 output_html_with_http_headers $query, $cookie, $template->output;