From: melinath <stephen.r.burrows@gmail.com>
Date: Wed, 16 Jun 2010 15:29:22 +0000 (-0400)
Subject: Merged origin/master
X-Git-Tag: philo-0.9~78^2~2^2~2
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/f9377788444b280c32dc7004f0a04b131bb74e14

Merged origin/master
---

f9377788444b280c32dc7004f0a04b131bb74e14
diff --cc admin.py
index 5737041,178a904..61a1fb8
--- a/admin.py
+++ b/admin.py
@@@ -135,30 -76,33 +135,65 @@@ class ModelLookupWidget(forms.TextInput
  		return mark_safe(output)
  
  
 +class NodeForm(TreeForm):
 +	def get_instance_class(self):
 +		return Node
 +		
 +	def get_validator_args(self):
 +		return [self.instance, 'instance']
 +
 +
 +class PageAdminForm(NodeForm):
 +	class Meta:
 +		model=Page
 +
 +
 +class RedirectAdminForm(NodeForm):
 +	class Meta:
 +		model=Redirect
 +
 +
 +class FileAdminForm(NodeForm):
 +	class Meta:
 +		model=File
 +
 +
- class PageAdmin(EntityAdmin):
++class NodeAdmin(EntityAdmin):
++	pass
++
++
+ class RedirectAdmin(NodeAdmin):
+ 	fieldsets = (
+ 		(None, {
+ 			'fields': ('slug', 'target', 'status_code')
+ 		}),
+ 		('URL/Tree/Hierarchy', {
+ 			'classes': ('collapse', 'collapse-closed'),
+ 			'fields': ('parent',)
+ 		}),
+ 	)
++	list_display=('slug', 'target', 'path', 'status_code',)
++	list_filter=('status_code',)
++	form = RedirectAdminForm
+ 
+ 
+ class FileAdmin(NodeAdmin):
+ 	prepopulated_fields = {'slug': ('file',)}
+ 	fieldsets = (
+ 		(None, {
+ 			'fields': ('file', 'slug', 'mimetype')
+ 		}),
+ 		('URL/Tree/Hierarchy', {
+ 			'classes': ('collapse', 'collapse-closed'),
+ 			'fields': ('parent',)
+ 		}),
+ 	)
++	form=FileAdminForm
++	list_display=('slug', 'mimetype', 'path', 'file',)
+ 
+ 
+ class PageAdmin(NodeAdmin):
+ 	add_form_template = 'admin/philo/page/add_form.html'
  	prepopulated_fields = {'slug': ('title',)}
  	fieldsets = (
  		(None, {
@@@ -240,17 -184,28 +278,6 @@@
  					contentreference.save()
  
  
- class RedirectAdmin(admin.ModelAdmin):
- 	list_display=('slug', 'target', 'path', 'status_code',)
- 	list_filter=('status_code',)
- 	form = RedirectAdminForm
- 
- 
- class FileAdmin(admin.ModelAdmin):
- 	form=FileAdminForm
- 	list_display=('slug', 'mimetype', 'path', 'file',)
 -class TemplateAdmin(admin.ModelAdmin):
 -	prepopulated_fields = {'slug': ('name',)}
 -	fieldsets = (
 -		(None, {
 -			'fields': ('parent', 'name', 'slug')
 -		}),
 -		('Documentation', {
 -			'classes': ('collapse', 'collapse-closed'),
 -			'fields': ('documentation',)
 -		}),
 -		(None, {
 -			'fields': ('code',)
 -		}),
 -		('Advanced', {
 -			'classes': ('collapse','collapse-closed'),
 -			'fields': ('mimetype',)
 -		}),
 -	)
 -	save_on_top = True
 -	save_as = True
--
--
  admin.site.register(Collection, CollectionAdmin)
  admin.site.register(Redirect, RedirectAdmin)
  admin.site.register(File, FileAdmin)