search: include facets in previous & next links

diff --git a/panikweb/search.py b/panikweb/search.py
index 5112e2be4952c56c1b1cb17a5792def0e541ce62..f1df7574fea6e63c960ba5a86c8b86e1b37a0d6e 100644 (file)
--- a/panikweb/search.py
+++ b/panikweb/search.py
@@ -136,6 +136,8 @@ class SearchView(FacetedSearchView):
     def extra_context(self):
         context = super(SearchView, self).extra_context()
         context['sectionName'] = 'Search'
+        if self.request.GET.getlist('selected_facets'):
+            context['facets_qs'] = '&selected_facets=' + '&'.join(self.request.GET.getlist('selected_facets'))
         context['selected_categories'] = [
                 x.split(':', 1)[1] for x in self.request.GET.getlist('selected_facets')
                 if x.startswith('categories_exact')]
@@ -181,6 +183,8 @@ class ListenArchivesView(FacetedSearchView):
     def extra_context(self):
         context = super(ListenArchivesView, self).extra_context()
         context['sectionName'] = "Listen"
+        if self.request.GET.getlist('selected_facets'):
+            context['facets_qs'] = '&selected_facets=' + '&'.join(self.request.GET.getlist('selected_facets'))
         context['selected_format'] = [
                 x.split(':', 1)[1] for x in self.request.GET.getlist('selected_facets')
                 if x.startswith('format_exact')]
@@ -220,6 +224,8 @@ class NewsArchivesView(FacetedSearchView):
 
     def extra_context(self):
         context = super(NewsArchivesView, self).extra_context()
+        if self.request.GET.getlist('selected_facets'):
+            context['facets_qs'] = '&selected_facets=' + '&'.join(self.request.GET.getlist('selected_facets'))
         context['sectionName'] = 'News'
         context['selected_news_categories'] = [
                 x.split(':', 1)[1] for x in self.request.GET.getlist('selected_facets')

diff --git a/panikweb_templates/templates/listen/archives.html b/panikweb_templates/templates/listen/archives.html
index 0e48e5affec977bd09ebe37a005eafd434781b35..f92d16e545458e4af297425cb180fe41b390f608 100644 (file)
--- a/panikweb_templates/templates/listen/archives.html
+++ b/panikweb_templates/templates/listen/archives.html
@@ -64,7 +64,7 @@
 
 {% if page.has_previous %}
        <div class="previous-page cf">
-               <a class="button big left" href="?q={{ query }}&amp;page={{ page.previous_page_number }}">&laquo; Résultats précédénts</a>
+               <a class="button big left" href="?q={{ query }}&amp;page={{ page.previous_page_number }}{{ facets_qs }}">&laquo; Résultats précédénts</a>
        </div>
 {% endif %}
 
@@ -76,7 +76,7 @@
 
 {% if page.has_next %}
        <div class="next-page cf">
-               <a class="button big right" href="?q={{ query }}&amp;page={{ page.next_page_number }}">Résultats suivants &raquo;</a>
+               <a class="button big right" href="?q={{ query }}&amp;page={{ page.next_page_number }}{{ facets_qs }}">Résultats suivants &raquo;</a>
        </div>
 {% endif %}
 

diff --git a/panikweb_templates/templates/news/archives.html b/panikweb_templates/templates/news/archives.html
index 9c8d2d70d384f4e1fae91d5d9c1efa72ab103bc8..57af0e32a7c57323b6ec0734169204374c321473 100644 (file)
--- a/panikweb_templates/templates/news/archives.html
+++ b/panikweb_templates/templates/news/archives.html
@@ -65,7 +65,7 @@
 
 {% if page.has_previous %}
        <div class="previous-page cf">
-               <a class="button big left" href="?q={{ query }}&amp;page={{ page.previous_page_number }}">&laquo; Résultats précédénts</a>
+               <a class="button big left" href="?q={{ query }}&amp;page={{ page.previous_page_number }}{{ facets_qs }}">&laquo; Résultats précédénts</a>
        </div>
 {% endif %}
 
@@ -91,7 +91,7 @@
 
 {% if page.has_next %}
        <div class="next-page cf">
-               <a class="button big right" href="?q={{ query }}&amp;page={{ page.next_page_number }}">Résultats suivants &raquo;</a>
+               <a class="button big right" href="?q={{ query }}&amp;page={{ page.next_page_number }}{{ facets_qs }}">Résultats suivants &raquo;</a>
        </div>
 {% endif %}
 

diff --git a/panikweb_templates/templates/search/search.html b/panikweb_templates/templates/search/search.html
index 7a17b48db48784d61b7fa36e3c1c970d5529c83d..e1113da600e408474b6d7b70bf9c2c4823956615 100644 (file)
--- a/panikweb_templates/templates/search/search.html
+++ b/panikweb_templates/templates/search/search.html
@@ -70,7 +70,7 @@
                {% endif %}
                {% if page.has_previous %}
                        <div class="previous-page cf">
-                               <a class="button big left" href="?q={{ query }}&amp;page={{ page.previous_page_number }}">&laquo; Résultats précédénts</a>
+                               <a class="button big left" href="?q={{ query }}&amp;page={{ page.previous_page_number }}{{ facets_qs }}">&laquo; Résultats précédénts</a>
                        </div>
                {% endif %}
 
@@ -89,7 +89,7 @@
                </ul>
                {% if page.has_next %}
                        <div class="next-page cf">
-                               <a class="button big right" href="?q={{ query }}&amp;page={{ page.next_page_number }}">Résultats suivants &raquo;</a>
+                               <a class="button big right" href="?q={{ query }}&amp;page={{ page.next_page_number }}{{ facets_qs }}">Résultats suivants &raquo;</a>
                        </div>
                {% endif %}
        </div>