Fixes #1624: SearchQuerySet is instantiated at startup

django-haystack · Jul 5, 2018 · 3c76320 · 3c76320
1 parent 4910ccb
commit 3c76320
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/haystack/backends/elasticsearch_backend.py b/haystack/backends/elasticsearch_backend.py
@@ -141,6 +141,7 @@ def __init__(self, connection_alias, **connection_options):
             **connection_options.get("KWARGS", {})
         )
         self.index_name = connection_options["INDEX_NAME"]
+        print(self.index_name)
         self.log = logging.getLogger("haystack")
         self.setup_complete = False
         self.existing_mapping = {}

diff --git a/haystack/generic_views.py b/haystack/generic_views.py
@@ -44,7 +44,6 @@ class SearchMixin(MultipleObjectMixin, FormMixin):
     template_name = "search/search.html"
     load_all = True
     form_class = ModelSearchForm
-    queryset = SearchQuerySet()
     context_object_name = None
     paginate_by = RESULTS_PER_PAGE
     paginate_orphans = 0
@@ -54,6 +53,11 @@ class SearchMixin(MultipleObjectMixin, FormMixin):
     search_field = "q"
     object_list = None
 
+    def get_queryset(self):
+        if self.queryset is None:
+            self.queryset = SearchQuerySet()
+        return self.queryset
+
     def get_form_kwargs(self):
         """
         Returns the keyword arguments for instantiating the form.