From 7b42eace96ac050bff80eed6bc8a4bc2fcb7b695 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 16 Dec 2021 14:15:34 +0100
Subject: [PATCH] Bug 29648: Log viewer - no sort

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 admin/columns_settings.yml                               | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt | 2 +-
 koha-tmpl/intranet-tmpl/prog/js/viewlog.js               | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 52b01204a0..78b14a3106 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1663,6 +1663,7 @@ modules:
 
     logviewer:
       logst:
+        default_display_length: 20
         columns:
             -
               columnname: date
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 f7cbcd044c..a5881d04a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt
@@ -479,7 +479,7 @@
     [% END %]
     [% Asset.js("lib/jsdiff/jsdiff.min.js") | $raw %]
     <script>
-        var columns_settings = [% TablesSettings.GetColumns('tools', 'logviewer', 'logst', 'json') | $raw %];
+        var table_settings = [% TablesSettings.GetTableSettings('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 0b867b05bc..c654b8b822 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/viewlog.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/viewlog.js
@@ -120,7 +120,7 @@ $(document).ready(function(){
         "autoWidth": false,
         "order": [[0, "desc"]],
         "pagingType" : "full"
-    }, columns_settings);
+    }, table_settings);
 
     $("body").on("click", ".compare_link", function(e){
         e.preventDefault();
-- 
2.39.5