Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-17 19:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleaned up database backend search method

Browse source
This commit is contained in:
Karl Hobley 2014-06-20 15:48:51 +01:00
parent 5e76a54b2b
commit 6d21727b03
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
wagtail/wagtailsearch/backends/db.py
View file

@ -49,7 +49,7 @@ class DBSearch(BaseSearch):
# Filter by terms
for term in terms:
term_query = None
term_query = models.Q()
for field_name in fields:
# Check if the field exists (this will filter out indexed callables)
try:
@ -58,11 +58,8 @@ class DBSearch(BaseSearch):
continue
# Filter on this field
field_filter = {'%s__icontains' % field_name: term}
if term_query is None:
term_query = models.Q(**field_filter)
else:
term_query |= models.Q(**field_filter)
term_query |= models.Q(**{'%s__icontains' % field_name: term})
query = query.filter(term_query)
# Distinct