From 156eb89850e1efdcdc2b6fc31fb74681441098dd Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Sun, 22 Jun 2014 16:10:50 +0100 Subject: [PATCH] Changed default values of filters and prefetch_related to None --- wagtail/wagtailsearch/backends/db.py | 2 +- wagtail/wagtailsearch/backends/elasticsearch.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/wagtail/wagtailsearch/backends/db.py b/wagtail/wagtailsearch/backends/db.py index c91363740..56536e343 100644 --- a/wagtail/wagtailsearch/backends/db.py +++ b/wagtail/wagtailsearch/backends/db.py @@ -27,7 +27,7 @@ class DBSearch(BaseSearch): def delete(self, obj): pass # Not needed - def search(self, query_string, model, fields=None, filters={}, prefetch_related=[]): + def search(self, query_string, model, fields=None, filters=None, prefetch_related=None): # Get fields if fields is None: fields = [field.field_name for field in model.get_searchable_search_fields()] diff --git a/wagtail/wagtailsearch/backends/elasticsearch.py b/wagtail/wagtailsearch/backends/elasticsearch.py index af810b02b..14b1a3bdb 100644 --- a/wagtail/wagtailsearch/backends/elasticsearch.py +++ b/wagtail/wagtailsearch/backends/elasticsearch.py @@ -576,7 +576,7 @@ class ElasticSearch(BaseSearch): except NotFoundError: pass # Document doesn't exist, ignore this exception - def search(self, query_string, model_or_queryset, fields=None, filters={}, prefetch_related=[]): + def search(self, query_string, model_or_queryset, fields=None, filters=None, prefetch_related=None): # Find model/queryset if isinstance(model_or_queryset, QuerySet): model = model_or_queryset.model @@ -602,8 +602,9 @@ class ElasticSearch(BaseSearch): queryset = queryset.filter(**filters) # Prefetch related - for prefetch in prefetch_related: - queryset = queryset.prefetch_related(prefetch) + if prefetch_related: + for prefetch in prefetch_related: + queryset = queryset.prefetch_related(prefetch) # Return search results return ElasticSearchResults(self, ElasticSearchQuery(queryset, query_string, fields=fields))