scratchfoundation/s2forums
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove query per row on search page

Browse source
This commit is contained in:
Glen Chiacchieri 2013-04-04 19:01:57 +00:00
parent cbd9c1158d
commit dd60f43182
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
djangobb_forum/templates/djangobb_forum/search_form.html
View file

@ -29,11 +29,11 @@
<select id="forum" name="forum"> <select id="forum" name="forum">
<option value="0">{% trans "All forums" %}</option> <option value="0">{% trans "All forums" %}</option>
{% for category in categories %} {% for category in categories %}
<optgroup label="{{ category }}"> <optgroup label="{{ category }}">
{% for forum in category.forums.all %} {% for forum in category.forums.all %}
<option value="{{ forum.id }}">{{ forum }}</option> <option value="{{ forum.id }}">{{ forum }}</option>
{% endfor %} {% endfor %}
</optgroup> </optgroup>
{% endfor %} {% endfor %}
</select> </select>
</label> </label>

9
djangobb_forum/views.py
View file

@ -143,9 +143,12 @@ def search(request, full=True):
template_dir = 'djangobb_forum/' if full else 'djangobb_forum/mobile/' template_dir = 'djangobb_forum/' if full else 'djangobb_forum/mobile/'
def _render_search_form(form=None): def _render_search_form(form=None):
return render(request, template_dir + 'search_form.html', {'categories': Category.objects.all(), # TODO: remove 'in' clause from following query
'form': form, categories_with_forums = Category.objects.prefetch_related('forums')
}) return render(request, template_dir + 'search_form.html', {
'categories': categories_with_forums,
'form': form,
})
if not 'action' in request.GET: if not 'action' in request.GET:
return _render_search_form(form=PostSearchForm()) return _render_search_form(form=PostSearchForm())