From 169fc5e853c77d52508f2b4e90f16784c64e1685 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 28 Jan 2025 10:33:19 +0100 Subject: [PATCH] Bug 26553: Bring default columnDefs back Signed-off-by: Martin Renvoize --- koha-tmpl/intranet-tmpl/prog/js/datatables.js | 12 ++++++++++++ koha-tmpl/opac-tmpl/bootstrap/js/datatables.js | 12 +++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js index f094bae8d3d..f399ce4ae9d 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js @@ -1380,6 +1380,18 @@ function update_search_description( } } + var default_column_defs = [ + { targets: ["string-sort"], type: "string" }, + { targets: ["anti-the"], type: "anti-the" }, + { targets: ["NoSort"], orderable: false, searchable: false }, + ]; + if (settings["columnDefs"] === undefined) { + settings["columnDefs"] = default_column_defs; + } else { + settings["columnDefs"] = + settings["columnDefs"].concat(default_column_defs); + } + $(this).data("bKohaColumnsUseNames", settings.bKohaColumnsUseNames); $(this).data("bKohaAjaxSVC", settings.bKohaAjaxSVC); // Must not be used for new tables! var table = $(this).dataTable(settings); diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js b/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js index 5abae7494d6..53dc44f25fc 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js +++ b/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js @@ -347,10 +347,16 @@ function _dt_visibility(table_settings, table_dt) { } var default_column_defs = [ - { aTargets: ["string-sort"], sType: "string" }, - { aTargets: ["anti-the"], sType: "anti-the" }, - { aTargets: ["NoSort"], bSortable: false, bSearchable: false }, + { targets: ["string-sort"], type: "string" }, + { targets: ["anti-the"], type: "anti-the" }, + { targets: ["NoSort"], orderable: false, searchable: false }, ]; + if (settings["columnDefs"] === undefined) { + settings["columnDefs"] = default_column_defs; + } else { + settings["columnDefs"] = + settings["columnDefs"].concat(default_column_defs); + } $(this).data("bKohaColumnsUseNames", settings.bKohaColumnsUseNames); var table = $(this).dataTable(settings); -- 2.48.1