mirror of
https://github.com/pirate/ArchiveBox.git
synced 2025-08-27 08:14:38 +02:00
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
This commit is contained in:
@@ -10,10 +10,10 @@ class SearchResultsAdminMixin:
|
|||||||
|
|
||||||
search_term = search_term.strip()
|
search_term = search_term.strip()
|
||||||
if not search_term:
|
if not search_term:
|
||||||
return qs, use_distinct
|
return qs.distinct(), use_distinct
|
||||||
try:
|
try:
|
||||||
qsearch = query_search_index(search_term)
|
qsearch = query_search_index(search_term)
|
||||||
qs = qs | qsearch
|
qs = qs & qsearch
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
print(f'[!] Error while using search backend: {err.__class__.__name__} {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}')
|
messages.add_message(request, messages.WARNING, f'Error from the search backend, only showing results from default admin search fields - Error: {err}')
|
||||||
|
Reference in New Issue
Block a user