from django.core.urlresolvers import reverse
from django.http import Http404, HttpResponse
from datetime import datetime
-from philo.contrib.penfield.utils import paginate
+from philo.utils import paginate
from philo.contrib.penfield.validators import validate_pagination_count
return base_patterns + entry_patterns
def index_view(self, request, node=None, extra_context=None):
- entries = self.blog.entries.all()
- if self.entries_per_page:
- paginated_page = paginate(request, entries, self.entries_per_page)
- entries = paginated_page.object_list
- else:
- paginated_page = None
+ paginator, page, entries = paginate(self.blog.entries.all(), self.entries_per_page, request.GET.get('page', 1))
context = {}
context.update(extra_context or {})
- context.update({'blog': self.blog, 'entries': entries, 'paginated_page': paginated_page})
+ context.update({'blog': self.blog, 'paginator': paginator, 'paginated_page': page, 'entries': entries})
return self.index_page.render_to_response(node, request, extra_context=context)
def entry_view(self, request, slug, year=None, month=None, day=None, node=None, extra_context=None):
entries = entries.filter(date__month=month)
if day:
entries = entries.filter(date__day=day)
- if self.entries_per_page:
- paginated_page = paginate(request, entries, self.entries_per_page)
- entries = paginated_page.object_list
- else:
- paginated_page = None
+
+ paginator, page, entries = paginate(entries, self.entries_per_page, request.GET.get('page', 1))
context = {}
context.update(extra_context or {})
- context.update({'blog': self.blog, 'year': year, 'month': month, 'day': day, 'entries': entries, 'paginated_page': paginated_page})
+ context.update({'blog': self.blog, 'year': year, 'month': month, 'day': day, 'paginator': paginator, 'paginated_page': page, 'entries': entries})
return self.entry_archive_page.render_to_response(node, request, extra_context=context)
def tag_view(self, request, tag_slugs, node=None, extra_context=None):
if entries.count() <= 0:
raise Http404
- if self.entries_per_page:
- paginated_page = paginate(request, entries, self.entries_per_page)
- entries = paginated_page.object_list
- else:
- paginated_page = None
+ paginator, page, entries = paginate(entries, self.entries_per_page, request.GET.get('page', 1))
context = {}
context.update(extra_context or {})
- context.update({'blog': self.blog, 'tags': tags, 'entries': entries, 'paginated_page': paginated_page})
+ context.update({'blog': self.blog, 'tags': tags, 'paginator': paginator, 'paginated_page': page, 'entries': entries})
return self.tag_page.render_to_response(node, request, extra_context=context)
def tag_archive_view(self, request, node=None, extra_context=None):
+++ /dev/null
-from django.core.paginator import Paginator, InvalidPage, EmptyPage
-
-
-def paginate(request, entries, entries_per_page):
- paginator = Paginator(entries, entries_per_page)
- try:
- page_number = int(request.GET.get('page', '1'))
- entries = paginator.page(page_number).object_list
- page = paginator.page(page_number)
- except ValueError:
- page_number = 1
- entries = paginator.page(page_number).object_list
- page = paginator.page(page_number)
- try:
- entries = paginator.page(page_number).object_list
- page = paginator.page(page_number)
- except (EmptyPage, InvalidPage):
- entries = paginator.page(paginator.num_pages).object_list
- page = paginator.page(page_number)
- return page
\ No newline at end of file
subpath = ""
subpath = "/" + subpath
view, args, kwargs = resolve(subpath, urlconf=self)
- view_args = getargspec(view)[0]
- if extra_context is not None and 'extra_context' in view_args:
+ view_args = getargspec(view)
+ if extra_context is not None and ('extra_context' in view_args[0] or view_args[2] is not None):
if 'extra_context' in kwargs:
extra_context.update(kwargs['extra_context'])
kwargs['extra_context'] = extra_context
- if 'node' in view_args:
+ if 'node' in view_args[0] or view_args[2] is not None:
kwargs['node'] = node
return view(request, *args, **kwargs)
template = models.ForeignKey(Template, related_name='pages')
title = models.CharField(max_length=255)
- def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+ def render_to_string(self, node=None, request=None, path=None, subpath=None, extra_context=None):
context = {}
context.update(extra_context or {})
- context.update({'node': node, 'page': self, 'attributes': self.attributes_with_node(node), 'relationships': self.relationships_with_node(node)})
- return HttpResponse(self.template.django_template.render(RequestContext(request, context)), mimetype=self.template.mimetype)
+ context.update({'page': self, 'attributes': self.attributes, 'relationships': self.relationships})
+ if node and request:
+ context.update({'node': node, 'attributes': self.attributes_with_node(node), 'relationships': self.relationships_with_node(node)})
+ return self.template.django_template.render(RequestContext(request, context))
+ return self.template.django_template.render(Context(context))
+
+ def render_to_response(self, node, request, path=None, subpath=None, extra_context=None):
+ return HttpResponse(self.render_to_string(node, request, path, subpath, extra_context), mimetype=self.template.mimetype)
def __unicode__(self):
return self.title
from django.db import models
from django.contrib.contenttypes.models import ContentType
+from django.core.paginator import Paginator, EmptyPage
class ContentTypeLimiter(object):
setattr(function, key, kwargs[key])
return function
return wrapper
+
+
+def paginate(objects, per_page=None, page_number=1):
+ """
+ Given a list of objects, return a (paginator, page, objects) tuple.
+ """
+ try:
+ per_page = int(per_page)
+ except (TypeError, ValueError):
+ # Then either it wasn't set or it was set to an invalid value
+ paginator = page = None
+
+ # There also shouldn't be pagination if the list is too short. Try count()
+ # first - good chance it's a queryset, where count is more efficient.
+ try:
+ if objects.count() <= per_page:
+ paginator = page = None
+ except AttributeError:
+ if len(objects) <= per_page:
+ paginator = page = None
+
+ try:
+ return paginator, page, objects
+ except NameError:
+ pass
+
+ paginator = Paginator(objects, per_page)
+ try:
+ page_number = int(page_number)
+ except:
+ page_number = 1
+
+ try:
+ page = paginator.page(page_number)
+ except EmptyPage:
+ page = None
+ else:
+ objects = page.object_list
+
+ return paginator, page, objects