From 539b470240b8fe078d1c31668540c4ad06fc4531 Mon Sep 17 00:00:00 2001 From: Pedro Amorim Date: Mon, 1 Apr 2024 12:24:54 +0000 Subject: [PATCH] Bug 36118: Update status and send notice core actions logging 1) Enable ILLlog sys pref 2) Enable ILLModule and install 'FreeForm', run: bash <(curl -s https://raw.githubusercontent.com/ammopt/koha-ill-dev/master/start-ill-dev.sh) 3) Create a new FreeForm request, visit: /cgi-bin/koha/ill/ill-requests.pl?method=create&backend=FreeForm 4) You need to checkout FreeForm's branch compatible with the CSRF work: cd /kohadevbox/koha/Koha/Illbackends/FreeForm git checkout b_36243 koha-plack --restart kohadev 5) Pick a type, insert '42' on cardnumber and pick a library, hit 'Create' 6) On the next screen, click 'Confirm request' and confirm. 7) Click 'ILL request log', notice the entry is there but has no information about who did the logged action. 8) Apply patches. Repeat steps 3) to 6). Notice the logged action now has information about the user who did the action. 9) Extra: Click 'Send notice to patron' and confirm that action is also logged with patron information. To my knowledge, these are the only 2 actions logged by core Logger. Backends logging their own actions that want patron information need to add it themselves following this pattern. Sponsored-by: UKHSA - UK Health Security Agency Sponsored-by: PTFS Europe Ltd Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Pedro Amorim --- .../prog/en/modules/ill/log/patron_notice.tt | 10 ++++----- .../prog/en/modules/ill/log/status_change.tt | 22 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/patron_notice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/patron_notice.tt index 76287896235..2d297473633 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/patron_notice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/patron_notice.tt @@ -1,6 +1,6 @@ [% USE KohaDates %] -

-[% log.timestamp | $KohaDates with_hours => 1 %] : Patron notice sent: -[% notice_code = log.info.notice_code %] -"[% log.notice_types.$notice_code.name | html %]" -

+[% PROCESS 'ill-request-log.inc' %] +[% WRAPPER ill_request_log action_label = "Patron notice sent: " %] + [% SET notice_code = log.info.notice_code %] + "[% log.notice_types.$notice_code.name | html %]" +[% END %] \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt index 5c184431652..ae6621117b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/log/status_change.tt @@ -1,12 +1,12 @@ [% USE KohaDates %] -

-[% log.timestamp | $KohaDates with_hours => 1 %] : Status changed -[% IF log.info.status_before %] -[% before = log.info.status_before %] -[% display_before = log.aliases.$before ? log.aliases.$before.lib : request.capabilities.$before.name %] -from "[% display_before | html %]" -[% END %] -[% after = log.info.status_after %] -[% display_after = log.aliases.$after ? log.aliases.$after.lib : request.capabilities.$after.name %] -to "[% display_after | html %]" -

+[% PROCESS 'ill-request-log.inc' %] +[% WRAPPER ill_request_log action_label = "Status changed" %] + [% IF log.info.status_before %] + [% before = log.info.status_before %] + [% display_before = log.aliases.$before ? log.aliases.$before.lib : request.capabilities.$before.name %] + from "[% display_before | html %]" + [% END %] + [% SET after = log.info.status_after %] + [% SET display_after = log.aliases.$after ? log.aliases.$after.lib : request.capabilities.$after.name %] + to "[% display_after | html %]" +[% END %] \ No newline at end of file -- 2.30.2