kopia lustrzana https://github.com/wagtail/wagtail
Remove URL type switching from pagination_nav; use querystring tag consistently instead
This doesn't preserve the old behaviour exactly, but testing across all paginated interfaces shows that it's better than it was (e.g. we're not forgetting to pass the current search term as query_string).pull/5146/head^2
Matt Westcott
rodzic
57d15ac635
commit
c827cf0793
|
|
@ -4,14 +4,10 @@
|
|||
{% comment %}
|
||||
HACK: This template expects to be passed a 'linkurl' parameter, containing a URL name
|
||||
that can be reverse-resolved by the {% url %} tag with no further parameters.
|
||||
Views that have parameters in their URL can work around this by passing a bogus
|
||||
(but non-blank) URL name, which will return an empty string and produce a final URL
|
||||
of the form "?q=123", implicitly preserving the current URL path.
|
||||
Views that have parameters in their URL can work around this by omitting linkurl,
|
||||
which will produce a final URL of the form "?q=123", implicitly preserving the current URL path.
|
||||
Using the {% url ... as ... %} form of the tag ensures that this fails silently,
|
||||
rather than throwing a NoReverseMatch exception.
|
||||
|
||||
If 'linkurl' is not passed, it will instead preserve the current URL and parameters,
|
||||
just replacing the 'p' parameter.
|
||||
{% endcomment %}
|
||||
{% if linkurl %}
|
||||
{% url linkurl as url_to_use %}
|
||||
|
|
@ -22,24 +18,12 @@
|
|||
<ul>
|
||||
<li class="prev">
|
||||
{% if items.has_previous %}
|
||||
{% if is_searching %}
|
||||
<a href="{{ url_to_use }}?q={{ query_string|urlencode }}&p={{ items.previous_page_number }}" class="icon icon-arrow-left">{% trans 'Previous' %}</a>
|
||||
{% elif not linkurl %}
|
||||
<a href="{% querystring p=items.previous_page_number %}" class="icon icon-arrow-left">{% trans 'Previous' %}</a>
|
||||
{% else %}
|
||||
<a href="{{ url_to_use }}?p={{ items.previous_page_number }}&ordering={{ ordering }}" class="icon icon-arrow-left">{% trans 'Previous' %}</a>
|
||||
{% endif %}
|
||||
<a href="{{ url_to_use }}{% querystring p=items.previous_page_number %}" class="icon icon-arrow-left">{% trans 'Previous' %}</a>
|
||||
{% endif %}
|
||||
</li>
|
||||
<li class="next">
|
||||
{% if items.has_next %}
|
||||
{% if is_searching %}
|
||||
<a href="{{ url_to_use }}?q={{ query_string|urlencode }}&p={{ items.next_page_number }}" class="icon icon-arrow-right-after">{% trans 'Next' %}</a>
|
||||
{% elif not linkurl %}
|
||||
<a href="{% querystring p=items.next_page_number %}" class="icon icon-arrow-right-after">{% trans 'Next' %}</a>
|
||||
{% else %}
|
||||
<a href="{{ url_to_use }}?p={{ items.next_page_number }}&ordering={{ ordering }}" class="icon icon-arrow-right-after">{% trans 'Next' %}</a>
|
||||
{% endif %}
|
||||
<a href="{{ url_to_use }}{% querystring p=items.next_page_number %}" class="icon icon-arrow-right-after">{% trans 'Next' %}</a>
|
||||
{% endif %}
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -106,7 +106,7 @@
|
|||
{% if submissions %}
|
||||
<form action="{% url 'wagtailforms:delete_submissions' form_page.id %}" method="get">
|
||||
{% include "wagtailforms/list_submissions.html" %}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=page_obj is_searching=False %}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=page_obj %}
|
||||
</form>
|
||||
{% else %}
|
||||
<p class="no-results-message">{% blocktrans with title=form_page.title %}There have been no submissions of the '{{ title }}' form.{% endblocktrans %}</p>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
{% include "wagtailredirects/list.html" %}
|
||||
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=redirects is_searching=query_string linkurl="wagtailredirects:index" %}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=redirects linkurl="wagtailredirects:index" %}
|
||||
{% else %}
|
||||
{% if query_string %}
|
||||
<p>{% blocktrans %}Sorry, no redirects match "<em>{{ query_string }}</em>"{% endblocktrans %}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
{% include "wagtailsearchpromotions/list.html" %}
|
||||
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=queries is_searching=is_searching linkurl="wagtailsearchpromotions:index" %}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=queries linkurl="wagtailsearchpromotions:index" %}
|
||||
{% else %}
|
||||
{% if is_searching %}
|
||||
<p>{% blocktrans %}Sorry, no promoted results match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
{% include "wagtaildocs/documents/list.html" %}
|
||||
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=documents is_searching=is_searching %}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=documents %}
|
||||
{% else %}
|
||||
{% if is_searching %}
|
||||
<h2>{% blocktrans %}Sorry, no documents match "<em>{{ query_string }}</em>"{% endblocktrans %}</h2>
|
||||
|
|
|
|||
|
|
@ -41,5 +41,5 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=used_by linkurl="-" %}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=used_by %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
{% endfor %}
|
||||
</ul>
|
||||
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=images is_searching=is_searching query_string=query_string %}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=images %}
|
||||
|
||||
{% else %}
|
||||
{% if is_searching %}
|
||||
|
|
|
|||
|
|
@ -41,5 +41,5 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=used_by linkurl="-" %}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=used_by %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
{% include "wagtailsnippets/snippets/list.html" %}
|
||||
|
||||
{% url 'wagtailsnippets:list' model_opts.app_label model_opts.model_name as wagtailsnippets_list_url %}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=items is_searching=is_searching linkurl=wagtailsnippets_list_url %}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=items linkurl=wagtailsnippets_list_url %}
|
||||
{% else %}
|
||||
{% if is_searching %}
|
||||
<p>{% blocktrans %}Sorry, no snippets match "<em>{{ query_string }}</em>"{% endblocktrans %}</p>
|
||||
|
|
|
|||
|
|
@ -41,5 +41,5 @@
|
|||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=used_by linkurl="-"%}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=used_by %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
{% if groups %}
|
||||
{% include "wagtailusers/groups/list.html" %}
|
||||
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=page_obj is_searching=is_searching linkurl="wagtailusers_groups:index" %}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=page_obj linkurl="wagtailusers_groups:index" %}
|
||||
{% elif is_searching %}
|
||||
<p>{% blocktrans with query=search_form.q.value %}Sorry, no groups match "{{ query }}"{% endblocktrans %}</p>
|
||||
{% else %}
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
{% include "wagtailusers/users/list.html" %}
|
||||
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=users is_searching=is_searching linkurl="wagtailusers_users:index" %}
|
||||
{% include "wagtailadmin/shared/pagination_nav.html" with items=users linkurl="wagtailusers_users:index" %}
|
||||
{% else %}
|
||||
{% if is_searching %}
|
||||
<h2>{% blocktrans %}Sorry, no users match "<em>{{ query_string }}</em>"{% endblocktrans %}</h2>
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue