From 30229e383cd3c2f92894449598a1433f52072c24 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Mon, 29 Jun 2020 18:15:39 +0000 Subject: [PATCH] Bug 25893: Use wildcards when searching logs The restores the wildcards that were used in the past To test: 0 - Ensure cataloguing logs and issues logs are enabled 1 - Edit an item 2 - Circulate that same item 3 - Browse to tools-> log viewer 4 - Put the itemnumber in the 'info' box 5 - You see only the circulation 6 - Put the itemnumber in the object box 7 - You see only the cataloging modification 8 - Apply patch 9 - Put itemnumber in info box 10 - you see both actions 11 - Put the itemnumber in the object box 12 - You see only the catalogiong modification Signed-off-by: Jason Robb Bug 25893: Don't wildcard object Signed-off-by: Katrin Fischer Bug 25893: (follow-up) Undo unrelated changes Signed-off-by: Jonathan Druart (cherry picked from commit bb0abf99c451113e8649c494d3a8b99f3916f942) Signed-off-by: Lucas Gass --- tools/viewlog.pl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/viewlog.pl b/tools/viewlog.pl index 2ccd472f0e..eb1a6900a4 100755 --- a/tools/viewlog.pl +++ b/tools/viewlog.pl @@ -54,7 +54,7 @@ my $user = $input->param("user") // ''; my @actions = $input->multi_param("actions"); my @interfaces = $input->multi_param("interfaces"); my $object = $input->param("object"); -my $object_type = $input->param("object_type"); +my $object_type = $input->param("object_type") // ''; my $info = $input->param("info"); my $datefrom = $input->param("from"); my $dateto = $input->param("to"); @@ -135,7 +135,6 @@ if ($do_it) { $search_params{action} = { -in => [ @actions ] } if ( defined $actions[0] && $actions[0] ne '' ); $search_params{interface} = { -in => [ @interfaces ] } if ( defined $interfaces[0] && $interfaces[0] ne '' ); - if ( @modules == 1 && $object_type eq 'biblio' ) { # Handle 'Modification log' from cataloguing my @itemnumbers = Koha::Items->search({ biblionumber => $object })->get_column('itemnumber'); @@ -144,7 +143,7 @@ if ($do_it) { { -and => { object => \@itemnumbers, info => { -like => 'item%' }}}, ]; } else { - $search_params{info} = $info if $info; + $search_params{info} = { -like => '%' . $info . '%' } if $info; $search_params{object} = $object if $object; } -- 2.39.5