EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Preserve active selected facets between searches

rtd2
Craig Nagy 2012-03-13 19:47:36 -04:00
parent 4dc181e2e1
commit eb7810ba80
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
readthedocs/core/views.py
View File

@ -276,7 +276,8 @@ class SearchView(TemplateView):
context['facets'] = self.results.facet_counts() # causes solr request #1 context['facets'] = self.results.facet_counts() # causes solr request #1
context['form'] = self.form context['form'] = self.form
context['query'] = self.query context['query'] = self.query
context['selected_facets'] = self.get_selected_facets_list() context['selected_facets'] = '&'.join(self.selected_facets)
context['selected_facets_list'] = self.get_selected_facets_list()
context['results'] = self.results context['results'] = self.results
context['count'] = len(self.results) # causes solr request #2 context['count'] = len(self.results) # causes solr request #2
return context return context

3
readthedocs/templates/search/base_facet.html
View File

@ -12,6 +12,7 @@
<form action="." method="GET"> <form action="." method="GET">
<div class="text-input-wrapper"> <div class="text-input-wrapper">
<input type="text" name="q" value="{{ query }}" autocomplete="off" id="id_site_search_2"> <input type="text" name="q" value="{{ query }}" autocomplete="off" id="id_site_search_2">
<input type="hidden" name="selected_facets" value="{{ selected_facets }}">
</div> </div>
<div class="submit-input-wrapper"> <div class="submit-input-wrapper">
<input type="submit" value="Go crazy." id="id_search_button"> <input type="submit" value="Go crazy." id="id_search_button">
@ -36,7 +37,7 @@
<div class="module-list-wrapper"> <div class="module-list-wrapper">
<ul id="id_search_result"> <ul id="id_search_result">
{% if query %} {% if query %}
{% autopaginate results 5 %} {% autopaginate results 10 %}
{% for result in results %} {% for result in results %}
<li class="module-item"> <li class="module-item">
{% ifequal result.model_name 'project' %} {% ifequal result.model_name 'project' %}

4
readthedocs/templates/search/faceted_project.html
View File

@ -2,8 +2,8 @@
{% block faceting %} {% block faceting %}
{% if query %} {% if query %}
{% if selected_facets %} {% if selected_facets_list %}
<h5>Filtered by {% for facet in selected_facets %} <h5>Filtered by {% for facet in selected_facets_list %}
<strong>{{ facet.1 }}</strong>{% if not forloop.last %}, {% endif %} <strong>{{ facet.1 }}</strong>{% if not forloop.last %}, {% endif %}
{% endfor %} <small>(<a href="?q={{ query }}">remove</a>)</small></h5> {% endfor %} <small>(<a href="?q={{ query }}">remove</a>)</small></h5>