From 28981beafd166a12be637324f5ed01cf06126e7a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 7 Oct 2021 12:17:51 +0200 Subject: [PATCH] Bug 28349: (bug 26234 follow-up) Correct wrong array merge Bug 26234 allowed to remove the different classes we use in aoColumnDefs for sorting columns of table using DT. However there is a terrible mistake, the merge of existing aoColumnDefs array with the default one is totally wrong: $.extend(true, new_parameters, default_column_defs); When we actually want $.extend(true, new_parameters["aoColumnDefs"], default_column_defs); We want to merge default_column_defs with the existing aocolumnDefs. This bug only exists when there is an existing aocolumnDefs. See commit d3f3a55e0b1544ebcd3166d141e126a4324baab1 It happens on: * cataloguing/z3950_search.tt * reports/guided_reports_start.tt * serials/subscription-detail.tt * opac-course-reserves.tt * opac-detail.tt However this bug has been hidden as we have in master related bug from bug 27945, which removes title-string. --- koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc index 0fd092013e2..d0ef25cc624 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -138,7 +138,7 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { if ( new_parameters["aoColumnDefs"] === undefined ) { new_parameters["aoColumnDefs"] = default_column_defs; } else { - $.extend(true, new_parameters, default_column_defs); + $.extend(true, new_parameters["aoColumnDefs"], default_column_defs); } table.dataTable(new_parameters); -- 2.25.1