View | Details | Raw Unified | Return to bug 20638
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/action-logs.inc (+6 lines)
Lines 1-5 Link Here
1
[% BLOCK translate_log_module %]
1
[% BLOCK translate_log_module %]
2
    [% SWITCH module %]
2
    [% SWITCH module %]
3
    [% CASE 'APIKEYS' %]
4
        <span>API keys</span>[% UNLESS Koha.Preference('ApiKeyLog') %]<i class="log-disabled fa-solid fa-triangle-exclamation" title="Log not enabled" data-log="ApiKeyLog"></i>[% END %]
3
    [% CASE 'AUTH' %]
5
    [% CASE 'AUTH' %]
4
        <span>Authentication</span>[% UNLESS Koha.Preference('AuthFailureLog') && Koha.Preference('AuthSuccessLog') %]
6
        <span>Authentication</span>[% UNLESS Koha.Preference('AuthFailureLog') && Koha.Preference('AuthSuccessLog') %]
5
            <i class="log-disabled fa-solid fa-triangle-exclamation" title="Log not enabled" data-log="AuthFailureLog|AuthSuccessLog"></i>
7
            <i class="log-disabled fa-solid fa-triangle-exclamation" title="Log not enabled" data-log="AuthFailureLog|AuthSuccessLog"></i>
Lines 49-60 Link Here
49
51
50
[% BLOCK translate_log_action %]
52
[% BLOCK translate_log_action %]
51
    [% SWITCH action %]
53
    [% SWITCH action %]
54
    [% CASE 'ACTIVATE' %]
55
        <span>Activate</span>
52
    [% CASE 'ADD' %]
56
    [% CASE 'ADD' %]
53
        <span>Add</span>
57
        <span>Add</span>
54
    [% CASE 'DELETE' %]
58
    [% CASE 'DELETE' %]
55
        <span>Delete</span>
59
        <span>Delete</span>
56
    [% CASE 'MODIFY' %]
60
    [% CASE 'MODIFY' %]
57
        <span>Modify</span>
61
        <span>Modify</span>
62
    [% CASE 'REVOKE' %]
63
        <span>Revoke</span>
58
    [% CASE 'ISSUE' %]
64
    [% CASE 'ISSUE' %]
59
        <span>Checkout</span>
65
        <span>Checkout</span>
60
    [% CASE 'RETURN' %]
66
    [% CASE 'RETURN' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-13 / +23 lines)
Lines 123-129 Link Here
123
                            [% ELSE %]
123
                            [% ELSE %]
124
                                <label for="moduleALL" class="viewlog"><input type="checkbox" id="moduleALL" name="modules" value="" /> All</label>
124
                                <label for="moduleALL" class="viewlog"><input type="checkbox" id="moduleALL" name="modules" value="" /> All</label>
125
                            [% END %]
125
                            [% END %]
126
                            [% FOREACH modx IN [ 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'CLAIMS' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE', 'NOTICES', 'NEWS', 'RECALLS', 'SUGGESTION', 'TRANSFERS' ] %]
126
                            [% FOREACH modx IN [ 'APIKEYS' 'AUTH' 'CATALOGUING' 'AUTHORITIES' 'MEMBERS' 'ACQUISITIONS' 'SERIAL' 'HOLDS' 'ILL' 'CIRCULATION' 'CLAIMS' 'FINES' 'SYSTEMPREFERENCE' 'CRONJOBS', 'REPORTS', 'SEARCHENGINE', 'NOTICES', 'NEWS', 'RECALLS', 'SUGGESTION', 'TRANSFERS' ] %]
127
                                [% IF modules.grep(modx).size %]
127
                                [% IF modules.grep(modx).size %]
128
                                    <label for="module[% modx | html %]" class="viewlog"
128
                                    <label for="module[% modx | html %]" class="viewlog"
129
                                        ><input type="checkbox" id="module[% modx | html %]" name="modules" value="[% modx | html %]" checked="checked" /> [% PROCESS translate_log_module module=modx %]</label
129
                                        ><input type="checkbox" id="module[% modx | html %]" name="modules" value="[% modx | html %]" checked="checked" /> [% PROCESS translate_log_module module=modx %]</label
Lines 147-153 Link Here
147
                            <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value="" /> All</label>
147
                            <label for="actionALL" class="viewlog"><input type="checkbox" id="actionALL" name="actions" value="" /> All</label>
148
                        [% END %]
148
                        [% END %]
149
149
150
                        [% FOREACH actx IN [ 'ADD' 'DELETE' 'MODIFY' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'MODCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'RESET PASS' 'Run' 'End' 'PATRON_MERGE' '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' 'ACQUISITION CLAIM' 'ACQUISITION ORDER' 'OVERDUE' 'EXPIRE' 'CREATE_RESTRICTION' 'MODIFY_RESTRICTION' 'DELETE_RESTRICTION' 'MODIFY_CARDNUMBER' ] %]
150
                        [% FOREACH actx IN [ 'ACTIVATE' 'ADD' 'DELETE' 'MODIFY' 'REVOKE' 'ISSUE' 'RETURN' 'RENEW' 'CREATE' 'CANCEL' 'FILL' 'SUSPEND' 'RESUME' 'ADDCIRCMESSAGE' 'MODCIRCMESSAGE' 'DELCIRCMESSAGE' 'STATUS_CHANGE' 'PATRON_NOTICE' 'CHANGE PASS' 'RESET PASS' 'Run' 'End' 'PATRON_MERGE' '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' 'ACQUISITION CLAIM' 'ACQUISITION ORDER' 'OVERDUE' 'EXPIRE' 'CREATE_RESTRICTION' 'MODIFY_RESTRICTION' 'DELETE_RESTRICTION' 'MODIFY_CARDNUMBER' ] %]
151
                            [% IF actions.grep(actx).size %]
151
                            [% IF actions.grep(actx).size %]
152
                                <label for="action[% actx| replace('\s+', '_') | html %]" class="viewlog"
152
                                <label for="action[% actx| replace('\s+', '_') | html %]" class="viewlog"
153
                                    ><input type="checkbox" id="action[% actx | replace('\s+', '_') | html %]" name="actions" value="[% actx | html %]" checked="checked" /> [% PROCESS translate_log_action action=actx %]</label
153
                                    ><input type="checkbox" id="action[% actx | replace('\s+', '_') | html %]" name="actions" value="[% actx | html %]" checked="checked" /> [% PROCESS translate_log_action action=actx %]</label
Lines 263-281 Link Here
263
                                <td>[% PROCESS translate_log_module module=loopro.module %]</td>
263
                                <td>[% PROCESS translate_log_module module=loopro.module %]</td>
264
                                <td>[% PROCESS translate_log_action action=loopro.action %]</td>
264
                                <td>[% PROCESS translate_log_action action=loopro.action %]</td>
265
                                <td>
265
                                <td>
266
                                    [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) %]
266
                                    [% IF ( loopro.module == 'MEMBERS' ) || ( loopro.module == 'CIRCULATION' ) || ( loopro.module == 'FINES' ) || ( loopro.module == 'APIKEYS' ) %]
267
                                        [% IF loopro.patron %]
267
                                        [% IF loopro.patron %]
268
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object | uri %]" title="Display member details.">
268
                                            [% IF ( loopro.module == 'APIKEYS' ) %]
269
                                                [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %]
269
                                                <a href="/cgi-bin/koha/members/apikeys.pl?patron_id=[% loopro.object | uri %]" title="View API keys for this patron">
270
                                                    [% loopro.patron.firstname | html %]
270
                                                    API keys for [% loopro.patron.firstname | html %] [% loopro.patron.surname | html %] ([% loopro.object | html %])
271
                                                    [% loopro.patron.surname | html %]
271
                                                </a>
272
                                                    ([% loopro.object | html %])
272
                                            [% ELSE %]
273
                                                [% ELSE %]
273
                                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.object | uri %]" title="Display member details.">
274
                                                    <span>Member</span> [% loopro.object | html %]
274
                                                    [% IF ( loopro.object ) %][% IF ( loopro.patron.firstname ) || ( loopro.patron.surname ) %]
275
                                                [% END %][% END %]
275
                                                        [% loopro.patron.firstname | html %]
276
                                            </a>
276
                                                        [% loopro.patron.surname | html %]
277
                                                        ([% loopro.object | html %])
278
                                                    [% ELSE %]
279
                                                        <span>Member</span> [% loopro.object | html %]
280
                                                    [% END %][% END %]
281
                                                </a>
282
                                            [% END %]
277
                                        [% ELSE %]
283
                                        [% ELSE %]
278
                                            [% loopro.object | html %]
284
                                            [% IF ( loopro.module == 'APIKEYS' ) %]
285
                                                API keys for patron [% loopro.object | html %]
286
                                            [% ELSE %]
287
                                                [% loopro.object | html %]
288
                                            [% END %]
279
                                        [% END %]
289
                                        [% END %]
280
                                    [% ELSIF ( loopro.module == 'CATALOGUING' ) %]
290
                                    [% ELSIF ( loopro.module == 'CATALOGUING' ) %]
281
                                        [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
291
                                        [% IF ( loopro.info.substr(0, 4) == 'item' ) %]
(-)a/tools/viewlog.pl (-3 / +6 lines)
Lines 203-210 if ($do_it) { Link Here
203
            }
203
            }
204
        }
204
        }
205
205
206
        #add firstname and surname for borrower, when using the CIRCULATION, MEMBERS, FINES
206
        #add firstname and surname for borrower, when using the CIRCULATION, MEMBERS, FINES, APIKEYS
207
        if ( $log->module eq "CIRCULATION" || $log->module eq "MEMBERS" || $log->module eq "FINES" ) {
207
        if (   $log->module eq "CIRCULATION"
208
            || $log->module eq "MEMBERS"
209
            || $log->module eq "FINES"
210
            || $log->module eq "APIKEYS" )
211
        {
208
            if ( $log->object ) {
212
            if ( $log->object ) {
209
                my $patron = Koha::Patrons->find( $log->object );
213
                my $patron = Koha::Patrons->find( $log->object );
210
                if ( $patron && $output eq 'screen' ) {
214
                if ( $patron && $output eq 'screen' ) {
211
- 

Return to bug 20638