Bugzilla – Attachment 164183 Details for
Bug 36118
ILL request log does not display patron information
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 36118: Preparation: Move action logs tt methods
Bug-36118-Preparation-Move-action-logs-tt-methods.patch (text/plain), 14.46 KB, created by
Pedro Amorim
on 2024-04-01 13:01:18 UTC
(
hide
)
Description:
Bug 36118: Preparation: Move action logs tt methods
Filename:
MIME Type:
Creator:
Pedro Amorim
Created:
2024-04-01 13:01:18 UTC
Size:
14.46 KB
patch
obsolete
>From 03117b08650b1ac99b66491e75d0d2027b6949fc Mon Sep 17 00:00:00 2001 >From: Pedro Amorim <pedro.amorim@ptfs-europe.com> >Date: Mon, 1 Apr 2024 11:23:15 +0000 >Subject: [PATCH] Bug 36118: Preparation: Move action logs tt methods > >This moves action logs related methods to its own .inc file in order to be reusable >--- > .../prog/en/includes/action-logs.inc | 103 +++++++++++++++++ > .../prog/en/modules/tools/viewlog.tt | 104 +----------------- > 2 files changed, 104 insertions(+), 103 deletions(-) > create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc >new file mode 100644 >index 00000000000..7a4b25d6b31 >--- /dev/null >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc >@@ -0,0 +1,103 @@ >+[% BLOCK translate_log_module %] >+[% SWITCH module %] >+[% CASE 'AUTH' %]<span>Authentication</span>[% UNLESS Koha.Preference('AuthFailureLog') || Koha.Preference('AuthScuccessLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+[% CASE 'CATALOGUING' %]<span>Catalog</span>[% UNLESS Koha.Preference('CataloguingLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE 'AUTHORITIES' %]<span>Authorities</span>[% UNLESS Koha.Preference('AuthoritiesLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE 'MEMBERS' %]<span>Patrons</span>[% UNLESS Koha.Preference('BorrowersLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE 'ACQUISITIONS' %]<span>Acquisitions</span>[% UNLESS Koha.Preference('AcquisitionLog') %]<i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE 'SERIAL' %]<span>Serials</span>[% UNLESS Koha.Preference('SubscriptionLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE 'HOLDS' %]<span>Holds</span>[% UNLESS Koha.Preference('HoldsLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE 'ILL' %]<span>Interlibrary loans</span>[% UNLESS Koha.Preference('IllLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE 'CIRCULATION' %]<span>Circulation</span>[% UNLESS Koha.Preference('IssueLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE 'CLAIMS' %]<span>Claims</span>[% UNLESS Koha.Preference('ClaimsLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE 'FINES' %]<span>Fines</span>[% UNLESS Koha.Preference('FinesLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE 'SYSTEMPREFERENCE' %]<span>System preferences</span> >+ >+[% CASE 'CRONJOBS' %]<span>Cron jobs</span>[% UNLESS Koha.Preference('CronjobLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE 'REPORTS' %]<span>Reports</span>[% UNLESS Koha.Preference('ReportsLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE 'SEARCHENGINE' %]<span>Search engine</span> >+ >+[% CASE 'NOTICES' %]<span>Notices</span>[% UNLESS Koha.Preference('NoticesLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+[% CASE 'NEWS' %]<span>News</span>[% UNLESS Koha.Preference('NewsLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+[% CASE 'RECALLS' %]<span>Recalls</span>[% UNLESS Koha.Preference('RecallsLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >+ >+[% CASE %][% module | html %] >+[% END %] >+[% END %] >+ >+[% BLOCK translate_log_action %] >+[% SWITCH action %] >+[% CASE 'ADD' %]<span>Add</span> >+[% CASE 'DELETE' %]<span>Delete</span> >+[% CASE 'MODIFY' %]<span>Modify</span> >+[% CASE 'ISSUE' %]<span>Checkout</span> >+[% CASE 'RETURN' %]<span>Return</span> >+[% CASE 'CREATE' %]<span>Create</span> >+[% CASE 'CANCEL' %]<span>Cancel</span> >+[% CASE 'FILL' %]<span>Fill</span> >+[% CASE 'RESUME' %]<span>Resume</span> >+[% CASE 'SUSPEND' %]<span>Suspend</span> >+[% CASE 'RENEW' %]<span>Renew</span> >+[% CASE 'RENEWAL' %]<span>Renew</span> >+[% CASE 'CHANGE PASS' %]<span>Change password</span> >+[% CASE 'RESET PASS' %]<span>Reset password</span> >+[% CASE 'ADDCIRCMESSAGE' %]<span>Add circulation message</span> >+[% CASE 'MODCIRCMESSAGE' %]<span>Modify circulation message</span> >+[% CASE 'DELCIRCMESSAGE' %]<span>Delete circulation message</span> >+[% CASE 'STATUS_CHANGE' %]<span>Change ILL request status</span> >+[% CASE 'PATRON_NOTICE' %]<span>ILL notice sent to patron</span> >+[% CASE 'ADD_BASKET' %]<span>Create an acquisitions basket</span> >+[% CASE 'MODIFY_BASKET' %]<span>Modify an acquisitions basket</span> >+[% CASE 'MODIFY_BASKET_HEADER' %]<span>Modify an acquisitions basket header</span> >+[% CASE 'MODIFY_BASKET_USERS' %]<span>Modify an acquisitions basket's users</span> >+[% CASE 'CLOSE_BASKET' %]<span>Close an acquisitions basket</span> >+[% CASE 'APPROVE_BASKET' %]<span>Approve an acquisitions basket</span> >+[% CASE 'REOPEN_BASKET' %]<span>Reopen an acquisitions basket</span> >+[% CASE 'CANCEL_ORDER' %]<span>Cancel an order</span> >+[% CASE 'CREATE_ORDER' %]<span>Create an order</span> >+[% CASE 'MODIFY_ORDER' %]<span>Modify an order</span> >+[% CASE 'CREATE_INVOICE_ADJUSTMENT' %]<span>Create an invoice adjustment</span> >+[% CASE 'UPDATE_INVOICE_ADJUSTMENT' %]<span>Modify an invoice adjustment</span> >+[% CASE 'DELETE_INVOICE_ADJUSTMENT' %]<span>Delete an invoice adjustment</span> >+[% CASE 'RECEIVE_ORDER' %]<span>Receive an order</span> >+[% CASE 'MODIFY_BUDGET' %]<span>Modify a budget</span> >+[% CASE 'CREATE_FUND' %]<span>Create a fund</span> >+[% CASE 'MODIFY_FUND' %]<span>Modify a fund</span> >+[% CASE 'DELETE_FUND' %]<span>Delete a fund</span> >+[% CASE 'Run' %]<span>Run</span> >+[% CASE 'End' %]<span>End</span> >+[% CASE 'EDIT_MAPPINGS' %]<span>Edit mappings</span> >+[% CASE 'RESET_MAPPINGS' %]<span>Reset mappings</span> >+[% CASE 'SERIAL CLAIM' %]<span>Serial claim</span> >+[% CASE 'ACQUISITION CLAIM' %]<span>Acquisition claim</span> >+[% CASE 'ACQUISITION ORDER' %]<span>Acquisition order</span> >+[% CASE 'OVERDUE' %]<span>Overdue</span> >+[% CASE 'EXPIRE' %]<span>Expire</span> >+[% CASE %][% action | html %] >+[% END %] >+[% END %] >+ >+[% BLOCK translate_log_interface %] >+[% SWITCH log_interface.upper %] >+[% CASE 'INTRANET' %]<span>Intranet</span> >+[% CASE 'OPAC' %]<span>OPAC</span> >+[% CASE 'SIP' %]<span>SIP</span> >+[% CASE 'COMMANDLINE' %]<span>Command-line</span> >+[% CASE 'API' %]<span>REST API</span> >+[% CASE 'CRON' %]<span>Cron job</span> >+[% CASE 'UPGRADE' %]<span>Upgrade</span> >+[% CASE %]<span>[% log_interface | html %]</span> >+[% END %] >+[% END %] >\ No newline at end of file >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 8afd131d242..3d1364b55a1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt >@@ -67,109 +67,7 @@ > [% INCLUDE 'cat-search.inc' %] > [% END %] > >-[% BLOCK translate_log_module %] >-[% SWITCH module %] >-[% CASE 'AUTH' %]<span>Authentication</span>[% UNLESS Koha.Preference('AuthFailureLog') || Koha.Preference('AuthScuccessLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >-[% CASE 'CATALOGUING' %]<span>Catalog</span>[% UNLESS Koha.Preference('CataloguingLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE 'AUTHORITIES' %]<span>Authorities</span>[% UNLESS Koha.Preference('AuthoritiesLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE 'MEMBERS' %]<span>Patrons</span>[% UNLESS Koha.Preference('BorrowersLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE 'ACQUISITIONS' %]<span>Acquisitions</span>[% UNLESS Koha.Preference('AcquisitionLog') %]<i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE 'SERIAL' %]<span>Serials</span>[% UNLESS Koha.Preference('SubscriptionLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE 'HOLDS' %]<span>Holds</span>[% UNLESS Koha.Preference('HoldsLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE 'ILL' %]<span>Interlibrary loans</span>[% UNLESS Koha.Preference('IllLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE 'CIRCULATION' %]<span>Circulation</span>[% UNLESS Koha.Preference('IssueLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE 'CLAIMS' %]<span>Claims</span>[% UNLESS Koha.Preference('ClaimsLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE 'FINES' %]<span>Fines</span>[% UNLESS Koha.Preference('FinesLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE 'SYSTEMPREFERENCE' %]<span>System preferences</span> >- >-[% CASE 'CRONJOBS' %]<span>Cron jobs</span>[% UNLESS Koha.Preference('CronjobLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE 'REPORTS' %]<span>Reports</span>[% UNLESS Koha.Preference('ReportsLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE 'SEARCHENGINE' %]<span>Search engine</span> >- >-[% CASE 'NOTICES' %]<span>Notices</span>[% UNLESS Koha.Preference('NoticesLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >-[% CASE 'NEWS' %]<span>News</span>[% UNLESS Koha.Preference('NewsLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >-[% CASE 'RECALLS' %]<span>Recalls</span>[% UNLESS Koha.Preference('RecallsLog') %] <i class="fa-solid fa-triangle-exclamation" title="Log not enabled"></i>[% END %] >- >-[% CASE %][% module | html %] >-[% END %] >-[% END %] >- >-[% BLOCK translate_log_action %] >-[% SWITCH action %] >-[% CASE 'ADD' %]<span>Add</span> >-[% CASE 'DELETE' %]<span>Delete</span> >-[% CASE 'MODIFY' %]<span>Modify</span> >-[% CASE 'ISSUE' %]<span>Checkout</span> >-[% CASE 'RETURN' %]<span>Return</span> >-[% CASE 'CREATE' %]<span>Create</span> >-[% CASE 'CANCEL' %]<span>Cancel</span> >-[% CASE 'FILL' %]<span>Fill</span> >-[% CASE 'RESUME' %]<span>Resume</span> >-[% CASE 'SUSPEND' %]<span>Suspend</span> >-[% CASE 'RENEW' %]<span>Renew</span> >-[% CASE 'RENEWAL' %]<span>Renew</span> >-[% CASE 'CHANGE PASS' %]<span>Change password</span> >-[% CASE 'RESET PASS' %]<span>Reset password</span> >-[% CASE 'ADDCIRCMESSAGE' %]<span>Add circulation message</span> >-[% CASE 'MODCIRCMESSAGE' %]<span>Modify circulation message</span> >-[% CASE 'DELCIRCMESSAGE' %]<span>Delete circulation message</span> >-[% CASE 'STATUS_CHANGE' %]<span>Change ILL request status</span> >-[% CASE 'PATRON_NOTICE' %]<span>ILL notice sent to patron</span> >-[% CASE 'ADD_BASKET' %]<span>Create an acquisitions basket</span> >-[% CASE 'MODIFY_BASKET' %]<span>Modify an acquisitions basket</span> >-[% CASE 'MODIFY_BASKET_HEADER' %]<span>Modify an acquisitions basket header</span> >-[% CASE 'MODIFY_BASKET_USERS' %]<span>Modify an acquisitions basket's users</span> >-[% CASE 'CLOSE_BASKET' %]<span>Close an acquisitions basket</span> >-[% CASE 'APPROVE_BASKET' %]<span>Approve an acquisitions basket</span> >-[% CASE 'REOPEN_BASKET' %]<span>Reopen an acquisitions basket</span> >-[% CASE 'CANCEL_ORDER' %]<span>Cancel an order</span> >-[% CASE 'CREATE_ORDER' %]<span>Create an order</span> >-[% CASE 'MODIFY_ORDER' %]<span>Modify an order</span> >-[% CASE 'CREATE_INVOICE_ADJUSTMENT' %]<span>Create an invoice adjustment</span> >-[% CASE 'UPDATE_INVOICE_ADJUSTMENT' %]<span>Modify an invoice adjustment</span> >-[% CASE 'DELETE_INVOICE_ADJUSTMENT' %]<span>Delete an invoice adjustment</span> >-[% CASE 'RECEIVE_ORDER' %]<span>Receive an order</span> >-[% CASE 'MODIFY_BUDGET' %]<span>Modify a budget</span> >-[% CASE 'CREATE_FUND' %]<span>Create a fund</span> >-[% CASE 'MODIFY_FUND' %]<span>Modify a fund</span> >-[% CASE 'DELETE_FUND' %]<span>Delete a fund</span> >-[% CASE 'Run' %]<span>Run</span> >-[% CASE 'End' %]<span>End</span> >-[% CASE 'EDIT_MAPPINGS' %]<span>Edit mappings</span> >-[% CASE 'RESET_MAPPINGS' %]<span>Reset mappings</span> >-[% CASE 'SERIAL CLAIM' %]<span>Serial claim</span> >-[% CASE 'ACQUISITION CLAIM' %]<span>Acquisition claim</span> >-[% CASE 'ACQUISITION ORDER' %]<span>Acquisition order</span> >-[% CASE 'OVERDUE' %]<span>Overdue</span> >-[% CASE 'EXPIRE' %]<span>Expire</span> >-[% CASE %][% action | html %] >-[% END %] >-[% END %] >- >-[% BLOCK translate_log_interface %] >-[% SWITCH log_interface.upper %] >-[% CASE 'INTRANET' %]<span>Intranet</span> >-[% CASE 'OPAC' %]<span>OPAC</span> >-[% CASE 'SIP' %]<span>SIP</span> >-[% CASE 'COMMANDLINE' %]<span>Command-line</span> >-[% CASE 'API' %]<span>REST API</span> >-[% CASE 'CRON' %]<span>Cron job</span> >-[% CASE 'UPGRADE' %]<span>Upgrade</span> >-[% CASE %]<span>[% log_interface | html %]</span> >-[% END %] >-[% END %] >+[% PROCESS 'action-logs.inc' %] > > [% WRAPPER 'sub-header.inc' %] > [% WRAPPER breadcrumbs %] >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 36118
:
162277
|
162278
|
162279
|
162585
|
162586
|
162587
|
163178
|
163179
|
163180
|
163181
|
163283
|
163284
|
163285
|
163286
|
164181
|
164182
|
164183
|
164184
|
164185
|
164398
|
164399
|
164400
|
164401
|
164402
|
164405
|
164406
|
164407
|
164408
|
164409
|
170450
|
170451
|
170452
|
170453
|
170454
|
171372
|
171373
|
171374
|
171375
|
172785
|
172786
|
172787
|
172788
|
172789
|
173023
|
173024
|
173025
|
173026
|
173027
|
173028
|
173029
|
173030
|
173031
|
173032
|
173033
|
173034
|
173035
|
173036
|
173037
|
173038
|
173039
|
173040
|
173041