Made referencing containers optional on pages. Fixes a bug.

[philo.git] / admin.py

diff --git a/admin.py b/admin.py
index 73dea0a..1566c5b 100644 (file)
--- a/admin.py
+++ b/admin.py
@@ -7,7 +7,9 @@ from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.html import escape
 from django.utils.text import truncate_words
-from models import *
+from philo.models import *
+from django.core.exceptions import ValidationError, ObjectDoesNotExist
+from validators import TreeParentValidator, TreePositionValidator
 
 
 class AttributeInline(generic.GenericTabularInline):
@@ -43,6 +45,42 @@ class CollectionMemberInline(admin.TabularInline):
 
 class CollectionAdmin(admin.ModelAdmin):
        inlines = [CollectionMemberInline]
+       list_display = ('name', 'description', 'get_count')
+
+
+class TreeForm(forms.ModelForm):
+       def __init__(self, *args, **kwargs):
+               super(TreeForm, self).__init__(*args, **kwargs)
+               instance = self.instance
+               instance_class=self.get_instance_class()
+               
+               if instance_class is not None:
+                       try:
+                               self.fields['parent'].queryset = instance_class.objects.exclude(id=instance.id)
+                       except ObjectDoesNotExist:
+                               pass
+                       
+               self.fields['parent'].validators = [TreeParentValidator(*self.get_validator_args())]
+       
+       def get_instance_class(self):
+               return self.instance.__class__
+               
+       def get_validator_args(self):
+               return [self.instance]
+       
+       def clean(self):
+               cleaned_data = self.cleaned_data
+               
+               try:
+                       parent = cleaned_data['parent']
+                       slug = cleaned_data['slug']
+                       obj_class = self.get_instance_class()
+                       tpv = TreePositionValidator(parent, slug, obj_class)
+                       tpv(self.instance)
+               except KeyError:
+                       pass
+               
+               return cleaned_data
 
 
 class TemplateAdmin(admin.ModelAdmin):
@@ -66,6 +104,7 @@ class TemplateAdmin(admin.ModelAdmin):
        save_on_top = True
        save_as = True
        list_display = ('__unicode__', 'slug', 'get_path',)
+       form = TreeForm
 
 
 class ModelLookupWidget(forms.TextInput):
@@ -95,6 +134,29 @@ 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):
        prepopulated_fields = {'slug': ('title',)}
        fieldsets = (
@@ -109,6 +171,7 @@ class PageAdmin(EntityAdmin):
        list_display = ('title', 'path', 'template')
        list_filter = ('template',)
        search_fields = ['title', 'slug', 'contentlets__content']
+       form = PageAdminForm
        
        def get_fieldsets(self, request, obj=None, **kwargs):
                fieldsets = list(self.fieldsets)
@@ -168,17 +231,27 @@ class PageAdmin(EntityAdmin):
                for container_name, container_content_type in contentreference_containers:
                        if ('contentreference_container_%s' % container_name) in form.cleaned_data:
                                content = form.cleaned_data[('contentreference_container_%s' % container_name)]
+                               if content == None:
+                                       continue
                                contentreference, created = page.contentreferences.get_or_create(name=container_name, defaults={'content': content})
                                if not created:
                                        contentreference.content = content
                                        contentreference.save()
 
+
 class RedirectAdmin(admin.ModelAdmin):
-       list_display=('slug', 'target', 'status_code',)
+       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',)
+
 
 admin.site.register(Collection, CollectionAdmin)
 admin.site.register(Redirect, RedirectAdmin)
-admin.site.register(File)
+admin.site.register(File, FileAdmin)
 admin.site.register(Page, PageAdmin)
 admin.site.register(Template, TemplateAdmin)