Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-04-14 20:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1849 from gasman/feature/page-chooser-search-pagination

Browse source 
Add pagination to page chooser search
This commit is contained in:
Karl Hobley 2015-10-21 10:58:36 +01:00
commit f7e19f2a06
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wagtail/wagtailadmin/templates/wagtailadmin/chooser/_search_results.html
View file

@ -1,7 +1,7 @@
{% load i18n %}
{% load i18n wagtailadmin_tags %}
<h2>
{% blocktrans count counter=pages|length %}
{% blocktrans count counter=pages.paginator.count %}
There is one match
{% plural %}
There are {{ counter }} matches
@ -10,4 +10,7 @@
{% if pages %}
{% include "wagtailadmin/pages/listing/_list_choose.html" with show_parent=1 pages=pages parent_page=parent_page %}
{% url 'wagtailadmin_choose_page_search' as pagination_base_url %}
{% paginate pages base_url=pagination_base_url classnames="navigate-pages" %}
{% endif %}

6
wagtail/wagtailadmin/templates/wagtailadmin/chooser/browse.js
View file

@ -52,6 +52,12 @@ function(modal) {
return false;
});
/* pagination links within search results should be AJAX-fetched
and the result loaded into .page-results (and ajaxified) */
$('.page-results a.navigate-pages', modal.body).click(function() {
$('.page-results', modal.body).load(this.href, ajaxifySearchResults);
return false;
});
}
/*

8
wagtail/wagtailadmin/views/chooser.py
View file

@ -116,20 +116,20 @@ def search(request, parent_page_id=None):
depth=1 # never include root
)
pages = filter_page_type(pages, desired_classes)
pages = pages.search(search_form.cleaned_data['q'], fields=['title'])[:10]
pages = pages.search(search_form.cleaned_data['q'], fields=['title'])
else:
pages = Page.objects.none()
shown_pages = []
paginator, pages = paginate(request, pages, per_page=25)
for page in pages:
page.can_choose = True
shown_pages.append(page)
return render(
request, 'wagtailadmin/chooser/_search_results.html',
shared_context(request, {
'searchform': search_form,
'pages': shown_pages,
'pages': pages,
'page_type_string': page_type_string,
})
)