From: melinath <stephen.r.burrows@gmail.com>
Date: Thu, 10 Jun 2010 14:56:38 +0000 (-0400)
Subject: Merge branch 'master' into cleanup
X-Git-Tag: philo-0.9~78^2~2^2^2~2^2~1
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/3738b672148e651a53db0a849f84b941bb9b3a6f?hp=818e3f52a72658d6b7ec5c1ce74fac9a6d21b0f3

Merge branch 'master' into cleanup
---

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 eb6ebc0..6eac9de 100644
--- a/models.py
+++ b/models.py
@@ -356,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)