瀏覽代碼

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
Neel Suthar 1 年之前
父節點
當前提交
279883d6bb
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      archivebox/core/mixins.py

+ 2 - 2
archivebox/core/mixins.py

@@ -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}')