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

Minor optimisation in ElasticSearchQuery

Browse source
This commit is contained in:
Karl Hobley 2014-06-22 15:51:29 +01:00 committed by Karl Hobley
parent b15522ac1e
commit 41199dd576
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
wagtail/wagtailsearch/backends/elasticsearch.py
View file

@ -260,15 +260,24 @@ class ElasticSearchQuery(object):
# Filters
filters = self._get_filters()
return {
'filtered': {
'query': query,
'filter': {
'and': filters,
if len(filters) == 1:
query = {
'filtered': {
'query': query,
'filter': filters[0],
}
}
}
elif len(filters) > 1:
query = {
'filtered': {
'query': query,
'filter': {
'and': filters,
}
}
}
return query
def __repr__(self):
return json.dumps(self.to_es())