From 4683827ce825bc57922dcb3800fde979b4a91a10 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 16 Dec 2021 12:17:30 +0100
Subject: [PATCH] Bug 29648: Patron categories administration view - normal

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                                  | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt | 2 +-
 koha-tmpl/intranet-tmpl/prog/js/categories.js               | 5 +----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 8fef3aa393..f8f518938e 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -237,6 +237,8 @@ modules:
 
     categories:
       patron_categories:
+        default_display_length: 20
+        default_sort_order: 1
         columns:
             -
               columnname: code
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
index d3f0916d1d..efdb5f86d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt
@@ -691,7 +691,7 @@
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
     <script>
-        var columns_settings = [% TablesSettings.GetColumns( 'admin', 'categories', 'patron_categories', 'json' ) | $raw %];
+        var table_settings = [% TablesSettings.GetTableSettings( 'admin', 'categories', 'patron_categories', 'json' ) | $raw %];
     </script>
     [% Asset.js("js/categories.js") | $raw %]
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/categories.js b/koha-tmpl/intranet-tmpl/prog/js/categories.js
index c3c1c85a47..efecda4e7e 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/categories.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/categories.js
@@ -31,12 +31,9 @@ $(document).ready(function() {
             "aTargets": [3, 4, 5],
             "sType": "natural"
         }, ],
-        "aaSorting": [
-            [1, "asc"]
-        ],
         "sPaginationType": "full",
         "exportColumns": [0,1,2,3,4,5,6,7,8,9,10,11,12],
-    }, columns_settings);
+    }, table_settings);
 
     if ($("#branches option:selected").length < 1) {
         $("#branches option:first").attr("selected", "selected");
-- 
2.39.5