From bd8b9951344952e33aa3cd6cb6d9acb4f836a337 Mon Sep 17 00:00:00 2001 From: Mark Veidemanis Date: Fri, 9 Dec 2022 07:20:28 +0000 Subject: [PATCH] Fix dedup --- core/db/__init__.py | 3 ++- core/views/ui/drilldown.py | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/core/db/__init__.py b/core/db/__init__.py index 6352b0c..19f9a8d 100644 --- a/core/db/__init__.py +++ b/core/db/__init__.py @@ -330,7 +330,8 @@ class StorageBackend(ABC): if kwargs.get("reverse"): response.reverse() if kwargs.get("dedup"): - if not kwargs.get("dedup_fields"): + dedup_fields = kwargs.get("dedup_fields") + if not dedup_fields: dedup_fields = ["msg", "nick", "ident", "host", "net", "channel"] response = helpers.dedup_list(response, dedup_fields) diff --git a/core/views/ui/drilldown.py b/core/views/ui/drilldown.py index a25cf18..5e9fb7b 100644 --- a/core/views/ui/drilldown.py +++ b/core/views/ui/drilldown.py @@ -173,6 +173,14 @@ class DrilldownTableView(SingleTableView): tags = parse_tags(query_params["tags"]) extra_params["tags"] = tags + if "dedup" in query_params: + if query_params["dedup"] == "on": + extra_params["dedup"] = True + else: + extra_params["dedup"] = False + else: + extra_params["dedup"] = False + context = db.query_results(request, query_params, **extra_params) # Unique is for identifying the widgets.