# HG changeset patch # User cavaliet # Date 1386266175 -3600 # Node ID 98039907717e328c20e8c8b2204d21a9bfb6e2b1 # Parent be41bddb8c6734613dd85ca0c1474a43921a4e0b v0.30 : debug search pagination diff -r be41bddb8c67 -r 98039907717e src/jocondelab/__init__.py --- a/src/jocondelab/__init__.py Wed Dec 04 17:19:39 2013 +0100 +++ b/src/jocondelab/__init__.py Thu Dec 05 18:56:15 2013 +0100 @@ -1,4 +1,4 @@ -VERSION = (0, 29, 0, "final", 0) +VERSION = (0, 30, 0, "final", 0) def get_version(): diff -r be41bddb8c67 -r 98039907717e src/jocondelab/views/front_office.py --- a/src/jocondelab/views/front_office.py Wed Dec 04 17:19:39 2013 +0100 +++ b/src/jocondelab/views/front_office.py Thu Dec 05 18:56:15 2013 +0100 @@ -10,7 +10,6 @@ from django.core.cache import cache from django.core.paginator import Paginator from django.db.models import Sum -from django.db.models.query import prefetch_related_objects from django.shortcuts import redirect from django.utils.http import urlencode from django.utils.translation import ugettext @@ -152,7 +151,7 @@ #TODO: test if paginator has page to avoid error paginator = Paginator(qs.values_list('id', flat=True).order_by('id').distinct(), npp) context["page_count"] = paginator.num_pages - ids = paginator.page(min(page,paginator.num_pages)) + ids = paginator.page(min(int(page),paginator.num_pages)) context["count"] = paginator.count if paginator.count==0: context["wkinfo"] = None