From 4d60dbcc208a2fdc82b44d475d4ebe764c203072 Mon Sep 17 00:00:00 2001 From: Stephen Burrows Date: Thu, 2 Sep 2010 12:22:10 -0400 Subject: [PATCH] Added slug to TagAdmin list_display. Corrected FeedMultiViewMixin to also paginate the root page. --- admin/base.py | 1 + contrib/penfield/utils.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/admin/base.py b/admin/base.py index f8485d2..46c7c22 100644 --- a/admin/base.py +++ b/admin/base.py @@ -32,6 +32,7 @@ class EntityAdmin(admin.ModelAdmin): class TagAdmin(admin.ModelAdmin): + list_display = ('name', 'slug') prepopulated_fields = {"slug": ("name",)} admin.site.register(Tag, TagAdmin) \ No newline at end of file diff --git a/contrib/penfield/utils.py b/contrib/penfield/utils.py index 3fe7e72..1a53cfe 100644 --- a/contrib/penfield/utils.py +++ b/contrib/penfield/utils.py @@ -2,6 +2,7 @@ from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed from django.conf.urls.defaults import url, patterns from django.core.urlresolvers import reverse from django.http import HttpResponse +from philo.utils import paginate class FeedMultiViewMixin(object): @@ -27,7 +28,7 @@ class FeedMultiViewMixin(object): context = self.get_context() context.update(extra_context or {}) - if 'page' in kwargs or 'page' in request.GET: + if 'page' in kwargs or 'page' in request.GET or (hasattr(self, 'per_page') and self.per_page): page_num = kwargs.get('page', request.GET.get('page', 1)) paginator, paginated_page, objects = paginate(objects, self.per_page, page_num) context.update({'paginator': paginator, 'paginated_page': paginated_page, self.list_var: objects}) -- 2.20.1