need new template when results are sequence objects

voseq/public_interface/forms.py

@@ -1,6 +1,10 @@
 from django import forms
 from haystack.forms import ModelSearchForm
 from haystack.query import SearchQuerySet
+from haystack.query import RelatedSearchQuerySet
+
+from .models import Vouchers
+from .models import Sequences
 
 
 class AdvancedSearchForm(ModelSearchForm):
@@ -111,7 +115,9 @@ def search(self):
 
         # Check if we got any input value to search from
         if bool(keywords) is True:
-            sqs = SearchQuerySet().using('advanced_search').filter(**keywords)
+            #sqs = SearchQuerySet().using('advanced_search').filter(**keywords)
+            sqs = RelatedSearchQuerySet().using('advanced_search').filter(**keywords).load_all()
+            sqs.load_all_queryset(Vouchers, Vouchers.objects.all())
 
             if len(sqs) > 0:
                 return sqs

voseq/public_interface/templates/public_interface/search_results.html

@@ -20,7 +20,7 @@ <h3>Search</h3>
   {% if result_count > 0 %}
     <p><b>I have found {{ result_count|intcomma }} results for query:</b> {{ query }}</p>
 
-      {% if suggestion != query and suggestion != None %}
+      {% if suggestion != query %}
         <span class="text-warning"><b>Did you mean:</b></span> <a href="/search/?q={{ suggestion }}">{{ suggestion }}</a>
       {% endif %}
     <hr>

voseq/public_interface/templates/search/indexes/public_interface/sequences_text.txt

@@ -1,2 +1,2 @@
-{{ object.labPerson }}
-{{ object.accession }}
+{{ object.sequences.labPerson }}
+{{ object.sequences.accession }}

voseq/public_interface/views.py

@@ -139,7 +139,26 @@ def search_advanced(request):
             )
             search_view.__call__(request)
             search_view.query = sqs.query
-            return search_view.create_response()
+            print(">>> search view query", search_view.results)
+
+            results_are_sequence_objects = False
+            for i in search_view.results:
+                try:
+                    print(i.object.code.genus)
+                    results_are_sequence_objects = True
+                except AttributeError:
+                    pass
+                break
+
+            if results_are_sequence_objects is False:
+                return search_view.create_response()
+            else:
+                return render(request, 'public_interface/search_results_sequence_objects.html',
+                    {
+                        'form': form,
+                        'version': version,
+                        'stats': stats,
+                    })
     else:
         form = AdvancedSearchForm()