Fixed a bug with FacetedSearchForm where cleaned_data may not exist. Thanks to imageinary for the report!

Author: toastdriven

haystack/forms.py

@@ -69,7 +69,7 @@ class FacetedSearchForm(SearchForm):
     def search(self):
         sqs = super(FacetedSearchForm, self).search()
 
-        if self.cleaned_data['selected_facets']:
+        if hasattr(self, 'cleaned_data') and self.cleaned_data['selected_facets']:
             sqs = sqs.narrow(self.cleaned_data['selected_facets'])
 
         return sqs
@@ -106,7 +106,7 @@ class FacetedModelSearchForm(ModelSearchForm):
     def search(self):
         sqs = super(FacetedModelSearchForm, self).search()
 
-        if self.cleaned_data['selected_facets']:
+        if hasattr(self, 'cleaned_data') and self.cleaned_data['selected_facets']:
             sqs = sqs.narrow(self.cleaned_data['selected_facets'])
 
         return sqs.models(*self.get_models())

tests/core/urls.py

@@ -1,5 +1,6 @@
 from django.conf.urls.defaults import *
 from haystack.backends.dummy_backend import SearchBackend, SearchQuery
+from haystack.forms import FacetedSearchForm
 from haystack.query import SearchQuerySet
 from haystack.views import SearchView, FacetedSearchView
 
@@ -15,6 +16,6 @@
 
 urlpatterns += patterns('haystack.views',
     url(r'^$', SearchView(load_all=False), name='haystack_search'),
-    url(r'^faceted/$', FacetedSearchView(searchqueryset=SearchQuerySet().facet('author')), name='haystack_faceted_search'),
+    url(r'^faceted/$', FacetedSearchView(searchqueryset=SearchQuerySet().facet('author'), form_class=FacetedSearchForm), name='haystack_faceted_search'),
     url(r'^basic/$', 'basic_search', {'load_all': False}, name='haystack_basic_search'),
 )