From 31df2b8820686f7f7c40a4420a260025054530f4 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sun, 7 Apr 2019 17:51:13 +0000 Subject: [PATCH] Bug 22069: Make log viewer find item renewals Without this patch renewals for checkouts wouldn't show in the log viewer. The log viewre was using RENEW, which we use for patrons, but for issue RENEWAL is used. The patch adds RENEWAL to the search params, when Circulation and Renew are selected in the form. To test: - Make sure you have RenewalLog turned on - Make a patron renewal - Check something out and renew it - Go to Tools > Log viewer and test different searches - Modules All - Actions All - Modules All - Actions Renew - Modules Circulation - Actions Renew ... - Make sure results show as expected --- koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt | 1 + tools/viewlog.pl | 2 ++ 2 files changed, 3 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt index d036880b16..64afbe27ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -52,6 +52,7 @@ [% CASE 'RESUME' %]Resume [% CASE 'SUSPEND' %]Suspend [% CASE 'RENEW' %]Renew +[% CASE 'RENEWAL' %]Renew [% CASE 'CHANGE PASS' %]Change password [% CASE 'ADDCIRCMESSAGE' %]Add circulation message [% CASE 'DELCIRCMESSAGE' %]Delete circulation message diff --git a/tools/viewlog.pl b/tools/viewlog.pl index f38ca19923..f081585553 100755 --- a/tools/viewlog.pl +++ b/tools/viewlog.pl @@ -126,6 +126,8 @@ if ($do_it) { '<=' => $dtf->format_datetime( $dateto_endday ) }; } + if ( grep { $_ eq 'CIRCULATION'} @modules && grep { $_ eq 'RENEW'} @actions ) { push @actions, 'RENEWAL' }; + $search_params{user} = $user if $user; $search_params{module} = { -in => [ @modules ] } if ( defined $modules[0] and $modules[0] ne '' ) ; $search_params{action} = { -in => [ @actions ] } if ( defined $actions[0] && $actions[0] ne '' ); -- 2.11.0