mirrors/wagtail
mirrors/wagtail
0
0
Fork 0
mirror of https://github.com/wagtail/wagtail.git synced 2024-12-01 03:31:04 +01:00
Code Issues Releases Wiki Activity

Use new QuerySet based search API in image chooser

Browse Source 
And cleanup pagination
This commit is contained in:
Karl Hobley 2015-07-06 16:08:43 +01:00
parent 41aa83a157
commit 54e6b8d7e3
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
wagtail/wagtailimages/views/chooser.py
View File

@ -48,27 +48,23 @@ def chooser(request):
if searchform.is_valid():
q = searchform.cleaned_data['q']
# page number
p = request.GET.get("p", 1)
images = Image.search(q, results_per_page=12, page=p)
images = Image.objects.search(q)
is_searching = True
else:
images = Image.objects.order_by('-created_at')
p = request.GET.get("p", 1)
paginator = Paginator(images, 12)
try:
images = paginator.page(p)
except PageNotAnInteger:
images = paginator.page(1)
except EmptyPage:
images = paginator.page(paginator.num_pages)
is_searching = False
# Pagination
page_number = request.GET.get("p", 1)
paginator = Paginator(images, 12)
try:
images = paginator.page(page_number)
except PageNotAnInteger:
images = paginator.page(1)
except EmptyPage:
images = paginator.page(paginator.num_pages)
return render(request, "wagtailimages/chooser/results.html", {
'images': images,
'is_searching': is_searching,