@@ -, +, @@
---
C4/Log.pm | 4 +++-
koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt | 3 ++-
misc/cronjobs/advance_notices.pl | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
--- a/C4/Log.pm
+++ a/C4/Log.pm
@@ -128,9 +128,11 @@ Logs the path and name of the calling script plus the information privided by pa
sub cronlogaction {
my $params = shift;
my $info = $params->{info};
+ my $action = $params->{action};
+ $action ||= "Run";
my $loginfo = (caller(0))[1];
$loginfo .= ' ' . $info if $info;
- logaction( 'CRONJOBS', 'Run', $$, $loginfo ) if C4::Context->preference('CronjobLog');
+ logaction( 'CRONJOBS', $action, $$, $loginfo ) if C4::Context->preference('CronjobLog');
}
1;
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -140,6 +140,7 @@
[% CASE 'MODIFY_FUND' %]Modify a fund
[% CASE 'DELETE_FUND' %]Delete a fund
[% CASE 'Run' %]Run
+[% CASE 'End' %]End
[% CASE 'EDIT_MAPPINGS' %]Edit mappings
[% CASE 'RESET_MAPPINGS' %]Reset mappings
[% CASE 'SERIAL CLAIM' %]Serial claim
@@ -239,7 +240,7 @@
[% END %]
- [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'Run' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' 'OVERDUE' 'EXPIRE' ] %]
+ [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'Run' 'End' 'EDIT_MAPPINGS' 'RESET_MAPPINGS' 'ADD_BASKET' 'MODIFY_BASKET' 'MODIFY_BASKET_HEADER' 'MODIFY_BASKET_USERS' 'CLOSE_BASKET' 'APPROVE_BASKET' 'REOPEN_BASKET' 'CANCEL_ORDER' 'CREATE_ORDER' 'MODIFY_ORDER' 'CREATE_INVOICE_ADJUSTMENT' 'UPDATE_INVOICE_ADJUSTMENT' 'DELETE_INVOICE_ADJUSTMENT' 'RECEIVE_ORDER' 'MODIFY_BUDGET' 'MODIFY_FUND' 'CREATE_FUND' 'DELETE_FUND' 'OVERDUE' 'EXPIRE' ] %]
[% IF actions.grep(actx).size %]
[% ELSE %]
--- a/misc/cronjobs/advance_notices.pl
+++ a/misc/cronjobs/advance_notices.pl
@@ -637,7 +637,7 @@ sub send_digests {
}
}
-cronlogaction({ info => "COMPLETED" });
+cronlogaction({ action => 'End', info => "COMPLETED" });
1;
--