@@ -1,8 +1,8 @@
11{% extends "oscar/base.html" %}
2−{% macro search_form_attrs() -%}
2+{% macro search_form_attrs(pageno) -%}
33 {% for category in selected_categories %}<input type="hidden" name="category_{{ category }}" value="1"/>{% endfor %}
44 <input type="hidden" name="q" value="{{ q|e }}" />
5− <input type="hidden" name="pageno" value="{{ pageno+1 }}" />
5+ <input type="hidden" name="pageno" value="{{ pageno }}" />
66 <input type="hidden" name="time_range" value="{{ time_range }}" />
77 <input type="hidden" name="language" value="{{ current_language }}" />
88{%- endmacro %}
@@ -58,13 +58,13 @@
5858 <div id="pagination">
5959 <div class="pull-left">
6060 <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="pull-left">
61− {{ search_form_attrs() }}
61+ {{ search_form_attrs(pageno+1) }}
6262 <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-backward"></span> {{ _('next page') }}</button>
6363 </form>
6464 </div>
6565 <div class="pull-right">
6666 <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="pull-left">
67− {{ search_form_attrs() }}
67+ {{ search_form_attrs(pageno-1) }}
6868 <button type="submit" class="btn btn-default" {% if pageno == 1 %}disabled{% endif %}><span class="glyphicon glyphicon-forward"></span> {{ _('previous page') }}</button>
6969 </form>
7070 </div>
@@ -74,13 +74,13 @@
7474 <div id="pagination">
7575 <div class="pull-left">
7676 <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="pull-left">
77− {{ search_form_attrs() }}
77+ {{ search_form_attrs(pageno-1) }}
7878 <button type="submit" class="btn btn-default" {% if pageno == 1 %}disabled{% endif %}><span class="glyphicon glyphicon-backward"></span> {{ _('previous page') }}</button>
7979 </form>
8080 </div>
8181 <div class="pull-right">
8282 <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="pull-left">
83− {{ search_form_attrs() }}
83+ {{ search_form_attrs(pageno+1) }}
8484 <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-forward"></span> {{ _('next page') }}</button>
8585 </form>
8686 </div>
@@ -132,7 +132,7 @@
132132 <div class="clearfix"></div>
133133 {% for output_type in ('csv', 'json', 'rss') %}
134134 <form method="{{ method or 'POST' }}" action="{{ url_for('index') }}" class="form-inline pull-{% if rtl %}right{% else %}left{% endif %} result_download">
135− {{ search_form_attrs() }}
135+ {{ search_form_attrs(pageno) }}
136136 <input type="hidden" name="format" value="{{ output_type }}">
137137 <button type="submit" class="btn btn-default">{{ output_type }}</button>
138138 </form>