From 0974d1a916bbfeb2e2988a8dc33caa75f769161e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 14 Nov 2024 11:16:06 +0100 Subject: [PATCH] Bug 36640: Fix behaviour of 'Clear filter' It must be disabled when the main search input is empty. Signed-off-by: Katrin Fischer --- .../intranet-tmpl/prog/en/includes/columns_settings.inc | 7 +++++++ koha-tmpl/intranet-tmpl/prog/js/datatables.js | 7 ++++--- 2 files changed, 11 insertions(+), 3 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 e4490a742f..b14872e5af 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc @@ -318,6 +318,13 @@ function KohaTable(id_selector, dt_parameters, table_settings, add_filters, defa } }); + table_dt.on( 'search.dt', function ( e, settings ) { + // When the DataTables search function is triggered, + // enable or disable the "Clear filter" button based on + // the presence of a search string + toggledClearFilter(table_dt.search(), settings.nTable.id); + }); + return table; } diff --git a/koha-tmpl/intranet-tmpl/prog/js/datatables.js b/koha-tmpl/intranet-tmpl/prog/js/datatables.js index 4d8dbcec03..9813505421 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/datatables.js +++ b/koha-tmpl/intranet-tmpl/prog/js/datatables.js @@ -75,10 +75,11 @@ var dataTablesDefaults = { DataTable.defaults.column.orderSequence = ['asc', 'desc']; function toggledClearFilter(searchText, tableId){ + let clear_filter_button = $("#" + tableId + "_wrapper").find(".dt_button_clear_filter"); if( searchText == "" ){ - $("#" + tableId + "_wrapper").find(".dt_button_clear_filter").addClass("disabled"); + clear_filter_button.addClass("disabled"); } else { - $("#" + tableId + "_wrapper").find(".dt_button_clear_filter").removeClass("disabled"); + clear_filter_button.removeClass("disabled"); } } @@ -1076,7 +1077,7 @@ function _dt_save_restore_state(table_settings, external_filter_nodes={}){ // When the DataTables search function is triggered, // enable or disable the "Clear filter" button based on // the presence of a search string - toggledClearFilter(settings.oPreviousSearch.sSearch, settings.nTable.id); + toggledClearFilter(table_dt.search(), settings.nTable.id); }); return table;