From 6f222544c4aca3f71dc0f731f609ed6c78b2bf09 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 6 Jan 2022 15:11:40 +0100
Subject: [PATCH] Bug 29648: Fix occurrences of GetColumns

We could add the configuration to these tables as well, but let go first
but the others (read: feeling lazy right now).

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>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt | 2 +-
 .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt | 4 ++--
 .../intranet-tmpl/prog/en/modules/circ/circulation.tt     | 4 ++--
 .../intranet-tmpl/prog/en/modules/circ/waitingreserves.tt | 8 ++++----
 .../prog/en/modules/members/moremember-print.tt           | 6 +++---
 .../intranet-tmpl/prog/en/modules/members/moremember.tt   | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt        | 4 ++--
 .../prog/en/modules/suggestion/suggestion.tt              | 4 ++--
 .../prog/en/modules/tools/marc_modification_templates.tt  | 2 +-
 .../intranet-tmpl/prog/en/modules/tools/modborrowers.tt   | 2 +-
 .../intranet-tmpl/prog/en/modules/tools/stockrotation.tt  | 4 ++--
 koha-tmpl/intranet-tmpl/prog/js/checkouts.js              | 2 +-
 .../intranet-tmpl/prog/js/marc_modification_templates.js  | 4 ++--
 koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js    | 4 ++--
 14 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
index 0aefdbec1b..60990b452e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
@@ -283,7 +283,7 @@
         }
 
         $(document).ready(function() {
-            columns_settings = [% TablesSettings.GetColumns( 'admin', 'currency', 'currencies-table', 'json' ) | $raw %]
+            columns_settings = [% TablesSettings.GetTableSettings( 'admin', 'currency', 'currencies-table', 'json' ) | $raw %]
             var issuest = KohaTable("currencies-table", {
                 dom: 'B<"clearfix">t',
             }, columns_settings );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index e8508d2e94..adf125d512 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -314,10 +314,10 @@
                 $("#dataPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface | html %]/[% theme | html %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>");
             });
 
-            columns_settings = [% TablesSettings.GetColumns( 'cataloguing', 'addbooks', 'reservoir-table', 'json' ) | $raw %]
+            var table_settings = [% TablesSettings.GetTableSettings( 'cataloguing', 'addbooks', 'reservoir-table', 'json' ) | $raw %]
             var reservoirt = KohaTable("reservoir-table", {
                 "pagingType": "simple"
-            }, columns_settings );
+            }, table_settings );
         });
 
         /* this function open a popup to search on z3950 server.  */
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 755fbca2ce..5a35cc181e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -1039,8 +1039,8 @@
     [% Asset.js("js/holds.js") | $raw %]
     [% INCLUDE 'calendar.inc' %]
     <script>
-        columns_settings_issues_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
-        columns_settings_borrowers_table = [% TablesSettings.GetColumns( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
+        table_settings_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
+        table_settings_borrowers_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %]
 
         [% IF borrowernumber and patron %]
             if( Cookies.get("holdfor") != [% patron.borrowernumber | html %]){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
index 9baff88191..227653ad03 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -179,20 +179,20 @@
     [% INCLUDE 'columns_settings.inc' %]
     <script>
         var MSG_CANCEL_SELECTED = _("Cancel selected (%s)");
-        var holdst_columns_settings = [% TablesSettings.GetColumns( 'circ', 'holds_awaiting_pickup', 'holdst', 'json' ) | $raw %];
-        var holdso_columns_settings = [% TablesSettings.GetColumns( 'circ', 'holds_awaiting_pickup', 'holdso', 'json' ) | $raw %];
+        var holdst_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'holds_awaiting_pickup', 'holdst', 'json' ) | $raw %];
+        var holdso_table_settings = [% TablesSettings.GetTableSettings( 'circ', 'holds_awaiting_pickup', 'holdso', 'json' ) | $raw %];
 
         $(document).ready(function() {
 
             KohaTable("holdst", {
                 "sPaginationType": "full",
                 "order": [[1, 'asc']]
-            }, holdst_columns_settings);
+            }, holdst_table_settings);
 
             KohaTable("holdso", {
                 "sPaginationType": "full",
                 "order": [[1, 'asc']]
-            }, holdso_columns_settings);
+            }, holdso_table_settings);
 
             $('#resultlist').tabs();
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
index 84dfbffd8f..bc993c3670 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
@@ -210,9 +210,9 @@
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
     <script>
-        var checkouts_columns = [% TablesSettings.GetColumns( 'circ', 'print_summary', 'print-summary-checkouts', 'json' ) | $raw %];
-        var holds_columns = [% TablesSettings.GetColumns( 'circ', 'print_summary', 'print-summary-holds', 'json' ) | $raw %];
-        var fines_columns = [% TablesSettings.GetColumns( 'circ', 'print_summary', 'print-summary-fines', 'json' ) | $raw %];
+        var checkouts_columns = [% TablesSettings.GetTableSettings( 'circ', 'print_summary', 'print-summary-checkouts', 'json' ) | $raw %];
+        var holds_columns = [% TablesSettings.GetTableSettings( 'circ', 'print_summary', 'print-summary-holds', 'json' ) | $raw %];
+        var fines_columns = [% TablesSettings.GetTableSettings( 'circ', 'print_summary', 'print-summary-fines', 'json' ) | $raw %];
 
         function moveColumnsButton( tableId ){
             /* Hide the export button */
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 2fe7020268..292f754c04 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -871,7 +871,7 @@
     [% Asset.js("js/recalls.js") | $raw %]
     <script>
 
-        columns_settings_issues_table = [% TablesSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
+        table_settings_issues_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
 
         $(document).ready(function() {
             $("#info_digests").tooltip();
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
index 964c0156ae..531869cb25 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
@@ -356,12 +356,12 @@
                 sale_table.DataTable().row($(this).parents('tr')).remove().draw(false);
         });
 
-        var items_columns_settings = [% TablesSettings.GetColumns('pos', 'pay', 'invoices', 'json') | $raw %];
+        var items_table_settings = [% TablesSettings.GetTableSettings('pos', 'pay', 'invoices', 'json') | $raw %];
         var items_table = KohaTable("invoices", {
                "sPaginationType": "full",
                "aaSorting": [[ 0, "asc" ]],
                "autoWidth": false
-        }, items_columns_settings, false);
+        }, items_table_settings, false);
 
         $("#invoices").on("click", ".add_button", function(e) {
             e.preventDefault();
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 22f161aea8..57ac6a156b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -1305,13 +1305,13 @@
             $(document).ready(function() {
                 $('#suggestiontabs').tabs();
 
-                columns_settings = [% TablesSettings.GetColumns( 'acqui', 'suggestions', 'suggestions', 'json' ) | $raw %]
+                table_settings = [% TablesSettings.GetTableSettings( 'acqui', 'suggestions', 'suggestions', 'json' ) | $raw %]
                 [% FOREACH suggestion IN suggestions %]
                     [% IF ( suggestion.suggestions_loop ) %]
                         KohaTable("table_[% loop.count| html %]", {
                             "sorting": [[ 3, "asc" ]],
                             "autoWidth": false,
-                        }, columns_settings );
+                        }, table_settings );
                     [% END %]
                 [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
index 2c0222b80f..f84290a370 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt
@@ -359,7 +359,7 @@
     [% INCLUDE 'datatables.inc' %]
     [% INCLUDE 'columns_settings.inc' %]
     <script>
-        columns_settings = [% TablesSettings.GetColumns('tools', 'marc-modification-templates', 'templatest', 'json') | $raw %];
+        table_settings = [% TablesSettings.GetTableSettings('tools', 'marc-modification-templates', 'templatest', 'json') | $raw %];
         [% IF ActionsLoop %]
             var mmtas = [% ActionsLoop.json | $raw %]
         [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
index 1a69521b97..be18b7899b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
@@ -391,7 +391,7 @@
     <script>
         var patron_attributes_lib = new Array();
         var patron_attributes_values = new Array();
-        var table_settings = [% TablesSettings.GetColumns( 'tools', 'batch_patron_modification', 'borrowerst', 'json' ) | $raw %];
+        var table_settings = [% TablesSettings.GetTableSettings( 'tools', 'batch_patron_modification', 'borrowerst', 'json' ) | $raw %];
         [% FOREACH attrh IN attributes_header %]
             table_settings.push({
                 columname: "[% attrh.attribute | html %]",
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
index 20e5123d2a..3082cea4b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt
@@ -615,8 +615,8 @@
     [% INCLUDE 'columns_settings.inc' %]
     [% Asset.js("js/pages/stockrotation.js") | $raw %]
     <script>
-        var stock_rotation_items_columns_settings = [% TablesSettings.GetColumns( 'tools', 'stockrotation', 'stock_rotation_manage_items', 'json' ) | $raw %];
-        var stock_rotation_columns_settings = [% TablesSettings.GetColumns( 'tools', 'stockrotation', 'stock_rotation', 'json' ) | $raw %];
+        var stock_rotation_items_table_settings = [% TablesSettings.GetTableSettings( 'tools', 'stockrotation', 'stock_rotation_manage_items', 'json' ) | $raw %];
+        var stock_rotation_table_settings = [% TablesSettings.GetTableSettings( 'tools', 'stockrotation', 'stock_rotation', 'json' ) | $raw %];
         $("#addStageModal, #addItemsModal").on("shown.bs.modal", function(){
             $("#branch, #barcode").focus();
         });
diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
index 88c59396d1..b649ada637 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
@@ -693,7 +693,7 @@ $(document).ready(function() {
                     .append(ul)
                     .insertBefore(oSettings.nTableWrapper)
             },
-        }, columns_settings_issues_table);
+        }, table_settings_issues_table);
 
         if ( $("#issues-table").length ) {
             $("#issues-table_processing").position({
diff --git a/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js b/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js
index b7565b734e..e513fbe896 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/marc_modification_templates.js
@@ -1,4 +1,4 @@
-/* global __ KohaTable columns_settings */
+/* global __ KohaTable table_settings */
 $(document).ready(function() {
     window.modaction_legend_innerhtml = $("#modaction_legend").text();
     window.action_submit_value = $("#action_submit").val();
@@ -110,7 +110,7 @@ $(document).ready(function() {
     });
 
     KohaTable("templatest", {
-    }, columns_settings);
+    }, table_settings);
 
 });
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js b/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js
index 19750c19a5..777adf5cf8 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/pages/stockrotation.js
@@ -72,7 +72,7 @@ $(document).ready(function() {
         ],
         "sPaginationType": "full",
         "autoWidth": false,
-    }, stock_rotation_items_columns_settings);
+    }, stock_rotation_items_table_settings);
 
     KohaTable("stock_rotation", {
         "aoColumnDefs": [
@@ -81,6 +81,6 @@ $(document).ready(function() {
         ],
         "sPaginationType": "full",
         "autoWidth": false,
-    }, stock_rotation_columns_settings);
+    }, stock_rotation_table_settings);
 
 });
-- 
2.39.5