diff --git a/voseq/public_interface/forms.py b/voseq/public_interface/forms.py index 40db01de..b4a54dfd 100644 --- a/voseq/public_interface/forms.py +++ b/voseq/public_interface/forms.py @@ -1,6 +1,7 @@ from django import forms from haystack.forms import ModelSearchForm from haystack.query import SearchQuerySet +from haystack.query import EmptySearchQuerySet class AdvancedSearchForm(ModelSearchForm): @@ -93,7 +94,8 @@ class AdvancedSearchForm(ModelSearchForm): labPerson = forms.CharField(max_length=100, required=False) def no_query_found(self): - return SearchQuerySet().none() + sqs = SearchQuerySet.none + return sqs def search(self): if not self.is_valid(): diff --git a/voseq/public_interface/templates/public_interface/search.html b/voseq/public_interface/templates/public_interface/search.html index 5b186d5f..e24b106f 100644 --- a/voseq/public_interface/templates/public_interface/search.html +++ b/voseq/public_interface/templates/public_interface/search.html @@ -1,6 +1,8 @@ {% extends 'public_interface/base.html' %} {% block content %} + +
@@ -9,8 +11,12 @@

Search by querying a single field for any combination of fields

-
+ {% if results == 'No results' %} +
No results were found
+ {% endif %} + +

Search by taxonomy

diff --git a/voseq/public_interface/views.py b/voseq/public_interface/views.py index 45acfe1a..d369b32f 100644 --- a/voseq/public_interface/views.py +++ b/voseq/public_interface/views.py @@ -42,6 +42,9 @@ def search(request): if results: return render(request, 'public_interface/search_results.html', {'form': form, 'results': results}) + else: + return render(request, 'public_interface/search.html', + {'form': form, 'results': 'No results'}) else: form = AdvancedSearchForm()