From dde3c5bdeb63f436510c70f52571e1bb93486480 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 16 Dec 2021 12:26:21 +0100
Subject: [PATCH] Bug 29648: Item types administration view

Set noItemTypeImages and OpacNoItemTypeImages to "No" and confirm
that the first column (the image) is not displayed. Otherwise test as
"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 ++
 .../intranet-tmpl/prog/en/modules/admin/itemtypes.tt      | 8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index a392306fab..79674077ee 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -275,6 +275,8 @@ modules:
 
     itemtypes:
       table_item_type:
+        default_display_length: 10
+        default_sort_order: 1
         columns:
             -
               columnname: image
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
index 6b190b2b8e..79763e85e3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt
@@ -613,17 +613,15 @@ Item types &rsaquo; Administration &rsaquo; Koha
     [% INCLUDE 'columns_settings.inc' %]
     <script>
          $(document).ready(function() {
-            var columns_settings = [% TablesSettings.GetColumns( 'admin', 'itemtypes', 'table_item_type', 'json' ) | $raw %];
+            var table_settings = [% TablesSettings.GetTableSettings( 'admin', 'itemtypes', 'table_item_type', 'json' ) | $raw %];
             [% IF ( Koha.Preference('noItemTypeImages') && Koha.Preference('OpacNoItemTypeImages') ) %]
-                columns_settings.shift(); // Remove item type image column from configuration
+                table_settings['columns'].shift(); // Remove item type image column from configuration
             [% END %]
 
             $(document).ready(function() {
                 KohaTable("table_item_type", {
-                "aaSorting": [[ 1, "asc" ]],
-                "iDisplayLength": 10,
                 "sPaginationType": "full"
-                }, columns_settings);
+                }, table_settings);
             });
 
             $( "#itemtypeentry" ).validate({
-- 
2.39.5