From 75c6f13eb4ce782cb3b371d688735be0e9d3992a Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 27 Dec 2023 16:01:05 +0000 Subject: [PATCH] Bug 33494: Make filters a toggle This patch updates the markup to make the 'Filter resolved | Show all' a toggle filter rather than two buttons. --- .../prog/en/modules/cataloguing/concerns.tt | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt index 2a9336cc29b..cdb3ec09da9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/concerns.tt @@ -39,9 +39,8 @@

Concerns

-
- Hide resolved - | Show all +
+ Include resolved
@@ -81,10 +80,10 @@ var table_settings = [% TablesSettings.GetTableSettings('cataloguing', 'concerns', 'table_concerns', 'json') | $raw %]; - var filtered = false; + var filter_resolved = true; let additional_filters = { resolved_date: function(){ - if ( filtered ) { + if ( filter_resolved ) { return { "=": null }; } else { return; @@ -184,14 +183,18 @@ ] }, table_settings, 1, additional_filters); - $('#hideResolved').on("click", function() { - filtered = true; - tickets.DataTable().draw(); - }); - - $('#showAll').on("click", function() { - filtered = false; + var txtActivefilter = _("Filter resolved"); + var txtInactivefilter = _("Include resolved"); + $('#resolved_filter').on("click", function() { + if ($(this).hasClass('filtered')){ + filter_resolved = false; + $(this).html(' '+txtActivefilter); + } else { + filter_resolved = true; + $(this).html(' '+txtInactivefilter); + } tickets.DataTable().draw(); + $(this).toggleClass('filtered'); }); }); -- 2.43.0