diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 05308af99d..1a24b3084b 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -1361,6 +1361,23 @@ modules: columnname: spent tools: + logviewer: + logst: + columns: + - + columnname: date + - + columnname: librarian + - + columnname: module + - + columnname: action + - + columnname: object + - + columnname: info + - + columnname: interface notices: lettert: columns: 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 6e466933f3..6613320f38 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -4,6 +4,7 @@ [% USE AuthorisedValues %] [% USE Branches %] [% USE KohaDates %] +[% USE TablesSettings %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -222,8 +223,8 @@ fieldset.rows label.viewlog { </form> [% IF ( do_it ) %] [% IF ( total ) %] - <h4>[% total | html %] lines found.</h4> - <table> + <h3>Log entries</h3> + <table id="logst"> <thead> <tr> <th>Date</th> @@ -238,7 +239,7 @@ fieldset.rows label.viewlog { <tbody> [% FOREACH loopro IN looprow %] <tr> - <td>[% loopro.timestamp | $KohaDates with_hours=1 %]</td> + <td data-order="[% loopro.timestamp | html %]">[% loopro.timestamp | $KohaDates with_hours=1 %]</td> <td> [% IF loopro.librarian %] <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> @@ -325,11 +326,16 @@ fieldset.rows label.viewlog { [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] + [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'columns_settings.inc' %] [% Asset.js("js/tools-menu.js") | $raw %] [% IF ( circulation ) %] [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] [% END %] + <script> + var columns_settings = [% TablesSettings.GetColumns('tools', 'logviewer', 'logst', 'json') | $raw %]; + </script> [% Asset.js("js/viewlog.js") | $raw %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/viewlog.js b/koha-tmpl/intranet-tmpl/prog/js/viewlog.js index ca7f5a3aa3..1354c95e0a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/viewlog.js +++ b/koha-tmpl/intranet-tmpl/prog/js/viewlog.js @@ -61,4 +61,10 @@ $(document).ready(function(){ tickAll('interfaces'); } }); + + var logst = KohaTable("logst", { + "autoWidth": false, + "order": [[0, "desc"]], + "pagingType" : "full" + }, columns_settings); });