From 279883d6bba11138ce7534a422b6fbcfbf48bf9e Mon Sep 17 00:00:00 2001 From: Neel Suthar Date: Sun, 21 Jan 2024 17:34:22 -0600 Subject: [PATCH 1/2] Text Search and Filters don't work at the same time in the web UI #1316 Making sure to return distinct results. Changing set operation to '&' to show the matching results from filters AND search term --- archivebox/core/mixins.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archivebox/core/mixins.py b/archivebox/core/mixins.py index 08c14a64..f41b2519 100644 --- a/archivebox/core/mixins.py +++ b/archivebox/core/mixins.py @@ -10,10 +10,10 @@ class SearchResultsAdminMixin: search_term = search_term.strip() if not search_term: - return qs, use_distinct + return qs.distinct(), use_distinct try: qsearch = query_search_index(search_term) - qs = qs | qsearch + qs = qs & qsearch except Exception as err: print(f'[!] Error while using search backend: {err.__class__.__name__} {err}') messages.add_message(request, messages.WARNING, f'Error from the search backend, only showing results from default admin search fields - Error: {err}') From 27d5d1ddc86b35e9d5a74ffe5a197e9de276a9c9 Mon Sep 17 00:00:00 2001 From: Nick Sweeting Date: Mon, 6 May 2024 23:13:52 -0700 Subject: [PATCH 2/2] revert queryset intersection back to union for search results --- archivebox/core/mixins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/archivebox/core/mixins.py b/archivebox/core/mixins.py index f41b2519..6dbab974 100644 --- a/archivebox/core/mixins.py +++ b/archivebox/core/mixins.py @@ -13,7 +13,7 @@ class SearchResultsAdminMixin: return qs.distinct(), use_distinct try: qsearch = query_search_index(search_term) - qs = qs & qsearch + qs = qs | qsearch except Exception as err: print(f'[!] Error while using search backend: {err.__class__.__name__} {err}') messages.add_message(request, messages.WARNING, f'Error from the search backend, only showing results from default admin search fields - Error: {err}')