summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2008-06-16 03:47:38 +0000
committerAdrian Holovaty <adrian@holovaty.com>2008-06-16 03:47:38 +0000
commitcc64abfc1d655cb662205e3085978d9f6edbd5a3 (patch)
tree73358493939cd13b95dd8b61bca3035751a7633f
parent16482911fde4e99777b0e439def6294234b78ef6 (diff)
Fixed #7329 -- Added list_display Admin options to FlatPage and Redirect models. Also changed list_filter for FlatPage. Thanks for the patch, benspaulding
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/contrib/flatpages/models.py3
-rw-r--r--django/contrib/redirects/models.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/django/contrib/flatpages/models.py b/django/contrib/flatpages/models.py
index 190ffbd8b3..ddd5678379 100644
--- a/django/contrib/flatpages/models.py
+++ b/django/contrib/flatpages/models.py
@@ -26,7 +26,8 @@ class FlatPage(models.Model):
(None, {'fields': ('url', 'title', 'content', 'sites')}),
(_('Advanced options'), {'classes': 'collapse', 'fields': ('enable_comments', 'registration_required', 'template_name')}),
)
- list_filter = ('sites',)
+ list_display = ('url', 'title')
+ list_filter = ('sites', 'enable_comments', 'registration_required')
search_fields = ('url', 'title')
def __unicode__(self):
diff --git a/django/contrib/redirects/models.py b/django/contrib/redirects/models.py
index ac2e8d5bac..1720f33466 100644
--- a/django/contrib/redirects/models.py
+++ b/django/contrib/redirects/models.py
@@ -17,6 +17,7 @@ class Redirect(models.Model):
ordering = ('old_path',)
class Admin:
+ list_display = ('old_path', 'new_path')
list_filter = ('site',)
search_fields = ('old_path', 'new_path')