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

(-)a/admin/columns_settings.yml (+17 lines)
Lines 1361-1366 modules: Link Here
1361
              columnname: spent
1361
              columnname: spent
1362
1362
1363
  tools:
1363
  tools:
1364
    logviewer:
1365
        logst:
1366
            columns:
1367
                -
1368
                    columnname: date
1369
                -
1370
                    columnname: librarian
1371
                -
1372
                    columnname: module
1373
                -
1374
                    columnname: action
1375
                -
1376
                    columnname: object
1377
                -
1378
                    columnname: info
1379
                -
1380
                    columnname: interface
1364
    notices:
1381
    notices:
1365
      lettert:
1382
      lettert:
1366
        columns:
1383
        columns:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt (-3 / +9 lines)
Lines 4-9 Link Here
4
[% USE AuthorisedValues %]
4
[% USE AuthorisedValues %]
5
[% USE Branches %]
5
[% USE Branches %]
6
[% USE KohaDates %]
6
[% USE KohaDates %]
7
[% USE TablesSettings %]
7
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
8
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
9
<title>
10
<title>
Lines 221-228 fieldset.rows label.viewlog { Link Here
221
			</form>
222
			</form>
222
                [% IF ( do_it ) %]
223
                [% IF ( do_it ) %]
223
                    [% IF ( total ) %]
224
                    [% IF ( total ) %]
224
                        <h4>[% total | html %] lines found.</h4>
225
                        <h3>Log entries</h3>
225
                        <table>
226
                        <table id="logst">
226
                            <thead>
227
                            <thead>
227
                                <tr>
228
                                <tr>
228
                                    <th>Date</th>
229
                                    <th>Date</th>
Lines 237-243 fieldset.rows label.viewlog { Link Here
237
                            <tbody>
238
                            <tbody>
238
                            [% FOREACH loopro IN looprow %]
239
                            [% FOREACH loopro IN looprow %]
239
                                <tr>
240
                                <tr>
240
                                    <td>[% loopro.timestamp | $KohaDates with_hours=1 %]</td>
241
                                    <td data-order="[% loopro.timestamp | html %]">[% loopro.timestamp | $KohaDates with_hours=1 %]</td>
241
                                    <td>
242
                                    <td>
242
                                        [% IF loopro.librarian %]
243
                                        [% IF loopro.librarian %]
243
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.librarian.borrowernumber | uri %]" title="display detail for this librarian."> [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname | html %] [% loopro.librarian.surname | html %] ([% loopro.librarian.borrowernumber | html %]) [% ELSE %][% loopro.librarian.borrowernumber | html %][% END %]</a>
244
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% loopro.librarian.borrowernumber | uri %]" title="display detail for this librarian."> [% IF ( loopro.librarian.firstname ) || ( loopro.librarian.surname ) %][% loopro.librarian.firstname | html %] [% loopro.librarian.surname | html %] ([% loopro.librarian.borrowernumber | html %]) [% ELSE %][% loopro.librarian.borrowernumber | html %][% END %]</a>
Lines 324-334 fieldset.rows label.viewlog { Link Here
324
325
325
[% MACRO jsinclude BLOCK %]
326
[% MACRO jsinclude BLOCK %]
326
    [% INCLUDE 'calendar.inc' %]
327
    [% INCLUDE 'calendar.inc' %]
328
    [% INCLUDE 'datatables.inc' %]
329
    [% INCLUDE 'columns_settings.inc' %]
327
    [% Asset.js("js/tools-menu.js") | $raw %]
330
    [% Asset.js("js/tools-menu.js") | $raw %]
328
    [% IF ( circulation ) %]
331
    [% IF ( circulation ) %]
329
        [% INCLUDE 'str/members-menu.inc' %]
332
        [% INCLUDE 'str/members-menu.inc' %]
330
        [% Asset.js("js/members-menu.js") | $raw %]
333
        [% Asset.js("js/members-menu.js") | $raw %]
331
    [% END %]
334
    [% END %]
335
    <script>
336
        var columns_settings = [% TablesSettings.GetColumns('tools', 'logviewer', 'logst', 'json') | $raw %];
337
    </script>
332
    [% Asset.js("js/viewlog.js") | $raw %]
338
    [% Asset.js("js/viewlog.js") | $raw %]
333
[% END %]
339
[% END %]
334
340
(-)a/koha-tmpl/intranet-tmpl/prog/js/viewlog.js (-1 / +6 lines)
Lines 61-64 $(document).ready(function(){ Link Here
61
            tickAll('interfaces');
61
            tickAll('interfaces');
62
        }
62
        }
63
    });
63
    });
64
65
    var logst = KohaTable("logst", {
66
        "autoWidth": false,
67
        "order": [[0, "desc"]],
68
        "pagingType" : "full"
69
    }, columns_settings);
64
});
70
});
65
- 

Return to bug 25968