From 90f32cbd5ff8c1151df8b0955fd7b61c8b15f829 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 5 Sep 2022 14:15:59 +0100 Subject: [PATCH] Bug 31435: (follow-up) Make KohaTable calls consistent Our calls to instantiate a KohaTable from were inconsistent in how they pass table_settings where no table_settings exist. This patch replaces empty arrays and empty hashrefs with a consistent 'null' being passed to ake it clear we don't have any settings to pass yet. --- .../intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt | 2 +- .../intranet-tmpl/prog/en/modules/admin/authorised_values.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt index 8bb5e07d85..9c462cb452 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/duplicate_orders.tt @@ -329,7 +329,7 @@ Acquisitions › Koha $('span.hint').hide(); KohaTable("table_orders", { "bPaginate": false - }); + }, null); [% IF op == 'search' OR op == 'select' %] patron_autocomplete({ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 71724c4746..22020df952 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -696,7 +696,7 @@ 'aaSortingFixed': [[ 1, 'asc' ]], 'bPaginate': false, "bAutoWidth": false - }); + }, null); $(oTable).treetable({ expandable: true diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt index 3f05f5e4a6..635954b2ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tt @@ -433,7 +433,7 @@ KohaTable("categoriest", { "aaSorting": [[ 0, "asc" ]], "sPaginationType": "full" - }); + }, null); if ( $("#branches option:selected").length < 1 ) { $("#branches option:first").attr("selected", "selected"); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt index c6e955fc81..214f0c5466 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/desks.tt @@ -227,7 +227,7 @@ $(document).ready(function() { KohaTable("table_desks", { "order": [[ 1, "asc" ]] - }); + }, null); }); [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index ff0a54a56b..f949076050 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -1341,7 +1341,7 @@ "aaSortingFixed": [ [0,'asc'], [1,'asc'], [2,'asc'], [3,'asc'] ], "bPaginate": false, "bAutoWidth": false - }); + }, null); }); function clear_edit(){ diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index f48413a010..31d300529e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -1995,7 +1995,7 @@ Note that permanent location is a code, and location may be an authval. fnCallback(json) } ); }, - }); + }, null); // Create new item groups $('.item-group-create').on('click', function(){ -- 2.20.1