From ac42b7fbeb6531cff8bf1b9d05a8cb88b409f5e3 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Thu, 13 Aug 2020 14:30:51 +0000
Subject: [PATCH] Revert "Bug 25968: Make logs sort by date descending as a
 default"

This reverts commit 10d515257c0c68a4ca07c8ab8108068ded1298e0.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 admin/columns_settings.yml                      | 17 -----------------
 .../prog/en/modules/tools/viewlog.tt            | 12 +++---------
 koha-tmpl/intranet-tmpl/prog/js/viewlog.js      |  6 ------
 3 files changed, 3 insertions(+), 32 deletions(-)

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