From 046b58ef29cb2d18867ac9551c5101a7850e359f Mon Sep 17 00:00:00 2001 From: melinath Date: Thu, 10 Jun 2010 01:03:20 -0400 Subject: [PATCH] Went back and fixed spacing issues with last cleanup. Also added some list display options to the redirect, template and page models to improve the admin site. --- .gitignore | 3 --- admin.py | 6 +++++- models.py | 7 ++----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5cde84d..0d20b64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ *.pyc -*~ -*# -TODO diff --git a/admin.py b/admin.py index fa62647..73dea0a 100644 --- a/admin.py +++ b/admin.py @@ -65,6 +65,7 @@ class TemplateAdmin(admin.ModelAdmin): ) save_on_top = True save_as = True + list_display = ('__unicode__', 'slug', 'get_path',) class ModelLookupWidget(forms.TextInput): @@ -172,9 +173,12 @@ class PageAdmin(EntityAdmin): contentreference.content = content contentreference.save() +class RedirectAdmin(admin.ModelAdmin): + list_display=('slug', 'target', 'status_code',) + list_filter=('status_code',) admin.site.register(Collection, CollectionAdmin) -admin.site.register(Redirect) +admin.site.register(Redirect, RedirectAdmin) admin.site.register(File) admin.site.register(Page, PageAdmin) admin.site.register(Template, TemplateAdmin) diff --git a/models.py b/models.py index dcb5d74..6eac9de 100644 --- a/models.py +++ b/models.py @@ -286,8 +286,7 @@ class File(Node): class Template(TreeModel): name = models.CharField(max_length=255) documentation = models.TextField(null=True, blank=True) - mimetype = models.CharField(max_length=255, null=True, blank=True, - help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE) + mimetype = models.CharField(max_length=255, null=True, blank=True, help_text='Default: %s' % settings.DEFAULT_CONTENT_TYPE) code = models.TextField(verbose_name='django template code') @property @@ -357,9 +356,7 @@ class Template(TreeModel): class Page(Node): """ - Represents an HTML page. The page will have a number of related Contentlets - depending on the template selected - but these will appear only after the - page has been saved with that template. + Represents an HTML page. The page will have a number of related Contentlets depending on the template selected - but these will appear only after the page has been saved with that template. """ template = models.ForeignKey(Template, related_name='pages') title = models.CharField(max_length=255) -- 2.20.1