Bug 13949 - Item search should have holding library

[koha_ffzg] / tools / viewlog.pl

diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index a13ec5f..3c37162 100755 (executable)
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -25,13 +25,12 @@ use CGI qw ( -utf8 );
 use Text::CSV::Encoded;
 use C4::Context;
 use C4::Koha;
-use C4::Dates;
 use C4::Output;
 use C4::Log;
 use C4::Items;
-use C4::Branch;
 use C4::Debug;
 use C4::Search;    # enabled_staff_search_views
+use Koha::Patron::Images;
 
 use vars qw($debug $cgi_debug);
 
@@ -45,9 +44,10 @@ my $input = new CGI;
 
 $debug or $debug = $cgi_debug;
 my $do_it    = $input->param('do_it');
-my @modules  = $input->param("modules");
+my @modules  = $input->multi_param("modules");
 my $user     = $input->param("user") // '';
-my @actions  = $input->param("actions");
+my @actions  = $input->multi_param("actions");
+my @interfaces  = $input->multi_param("interfaces");
 my $object   = $input->param("object");
 my $info     = $input->param("info");
 my $datefrom = $input->param("from");
@@ -74,8 +74,8 @@ if ( $src eq 'circ' ) {
     use C4::Members::Attributes qw(GetBorrowerAttributes);
     my $borrowernumber = $object;
     my $data = GetMember( 'borrowernumber' => $borrowernumber );
-    my ( $picture, $dberror ) = GetPatronImage( $data->{'borrowernumber'} );
-    $template->param( picture => 1 ) if $picture;
+    my $patron_image = Koha::Patron::Images->find($data->{borrowernumber});
+    $template->param( picture => 1 ) if $patron_image;
 
     if ( C4::Context->preference('ExtendedPatronAttributes') ) {
         my $attributes = GetBorrowerAttributes( $data->{'borrowernumber'} );
@@ -85,15 +85,12 @@ if ( $src eq 'circ' ) {
         );
     }
 
-    my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
     $template->param(%$data);
 
     $template->param(
         menu           => 1,
         borrowernumber => $borrowernumber,
         categoryname   => $data->{'description'},
-        roadtype       => $roadtype,
-        branchname     => GetBranchName( $data->{'branchcode'} ),
         RoutingSerials => C4::Context->preference('RoutingSerials'),
     );
 }
@@ -107,10 +104,11 @@ $template->param(
 if ($do_it) {
 
     my @data;
-    my ( $results, $modules, $actions );
+    my ( $results, $modules, $actions, $interfaces );
     if ( defined $actions[0] && $actions[0] ne '' ) { $actions  = \@actions; }     # match All means no limit
     if ( $modules[0] ne '' ) { $modules = \@modules; }    # match All means no limit
-    $results = GetLogs( $datefrom, $dateto, $user, $modules, $actions, $object, $info );
+    if ( defined $interfaces[0] && $interfaces[0] ne '' ) { $interfaces = \@interfaces; }    # match All means no limit
+    $results = GetLogs( $datefrom, $dateto, $user, $modules, $actions, $object, $info, $interfaces );
     @data = @$results;
     foreach my $result (@data) {
 
@@ -172,6 +170,7 @@ if ($do_it) {
             src      => $src,
             modules  => \@modules,
             actions  => \@actions,
+            interfaces => \@interfaces
         );
 
         # Used modules