From 13225ec43afd6234605ece60b666d74af2bac411 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 --- koha-tmpl/intranet-tmpl/prog/js/datatables.js | 11 +++++++++++ koha-tmpl/opac-tmpl/bootstrap/js/datatables.js | 11 ++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js index 0a489f31a3a..a49e1d30f2d 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js @@ -1091,6 +1091,17 @@ function _dt_save_restore_state(table_settings, external_filter_nodes={}){ } } + 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 1c786951a00..c4d270ff153 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js +++ b/koha-tmpl/opac-tmpl/bootstrap/js/datatables.js @@ -311,10 +311,15 @@ 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.34.1