From 4625df32284b2432397fe447d2c26707bb5e1632 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 12 Apr 2021 17:29:09 +0000 Subject: [PATCH] Bug 28055: (follow-up) Revert changes to aoColumnDefs option name This patch undoes changes to two lines in columns_settings.inc which were triggering unwanted side-effects. There are several templates and JavaScript files which use "aoColumnDefs" to pass options to columns settings, and if we change this file without changing those at the same time things will break. When these lines are updated it must be done so at the same time as we modify the templates which pass that same option. Signed-off-by: Jonathan Druart --- koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7f3c214ddc..0fd092013e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -135,8 +135,8 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) { { "targets": [ "anti-the" ], "type": "anti-the" }, { "targets": [ "NoSort" ], "orderable": false, "searchable": false }, ]; - if ( new_parameters["columnDefs"] === undefined ) { - new_parameters["columnDefs"] = default_column_defs; + if ( new_parameters["aoColumnDefs"] === undefined ) { + new_parameters["aoColumnDefs"] = default_column_defs; } else { $.extend(true, new_parameters, default_column_defs); } -- 2.39.5