Merge git://github.com/melinath/philo into melinath

[philo.git] / admin.py

diff --git a/admin.py b/admin.py
index af97bde..0f34028 100644 (file)
--- a/admin.py
+++ b/admin.py
@@ -7,17 +7,20 @@ 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
 
 
+COLLAPSE_CLASSES = ('collapse', 'collapse-closed', 'closed',)
+
+
 class AttributeInline(generic.GenericTabularInline):
        ct_field = 'entity_content_type'
        ct_fk_field = 'entity_object_id'
        model = Attribute
        extra = 1
-       classes = ('collapse-closed',)
+       template = 'admin/philo/edit_inline/tabular_collapse.html'
        allow_add = True
 
 
@@ -26,7 +29,7 @@ class RelationshipInline(generic.GenericTabularInline):
        ct_fk_field = 'entity_object_id'
        model = Relationship
        extra = 1
-       classes = ('collapse-closed',)
+       template = 'admin/philo/edit_inline/tabular_collapse.html'
        allow_add = True
 
 
@@ -39,12 +42,14 @@ class CollectionMemberInline(admin.TabularInline):
        fk_name = 'collection'
        model = CollectionMember
        extra = 1
-       classes = ('collapse-closed',)
+       classes = COLLAPSE_CLASSES
        allow_add = True
+       fields = ('member_content_type', 'member_object_id', 'index',)
 
 
 class CollectionAdmin(admin.ModelAdmin):
        inlines = [CollectionMemberInline]
+       list_display = ('name', 'description', 'get_count')
 
 
 class TreeForm(forms.ModelForm):
@@ -52,10 +57,13 @@ class TreeForm(forms.ModelForm):
                super(TreeForm, self).__init__(*args, **kwargs)
                instance = self.instance
                instance_class=self.get_instance_class()
-               try:
-                       self.fields['parent'].queryset = instance_class.objects.exclude(id=instance.id)
-               except ObjectDoesNotExist:
-                       pass
+               
+               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):
@@ -86,14 +94,14 @@ class TemplateAdmin(admin.ModelAdmin):
                        'fields': ('parent', 'name', 'slug')
                }),
                ('Documentation', {
-                       'classes': ('collapse', 'collapse-closed'),
+                       'classes': COLLAPSE_CLASSES,
                        'fields': ('documentation',)
                }),
                (None, {
                        'fields': ('code',)
                }),
                ('Advanced', {
-                       'classes': ('collapse','collapse-closed'),
+                       'classes': COLLAPSE_CLASSES,
                        'fields': ('mimetype',)
                }),
        )
@@ -132,7 +140,7 @@ class ModelLookupWidget(forms.TextInput):
 
 class NodeForm(TreeForm):
        def get_instance_class(self):
-               return self.instance.node_ptr.__class__
+               return Node
                
        def get_validator_args(self):
                return [self.instance, 'instance']
@@ -153,15 +161,50 @@ class FileAdminForm(NodeForm):
                model=File
 
 
-class PageAdmin(EntityAdmin):
+class NodeAdmin(EntityAdmin):
+       pass
+
+
+class RedirectAdmin(NodeAdmin):
+       fieldsets = (
+               (None, {
+                       'fields': ('slug', 'target', 'status_code')
+               }),
+               ('URL/Tree/Hierarchy', {
+                       'classes': COLLAPSE_CLASSES,
+                       '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_CLASSES,
+                       '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, {
-                       'fields': ('title', 'template')
+                       'fields': ('title', 'slug', 'template')
                }),
                ('URL/Tree/Hierarchy', {
-                       'classes': ('collapse', 'collapse-closed'),
-                       'fields': ('parent', 'slug')
+                       'classes': COLLAPSE_CLASSES,
+                       'fields': ('parent',)
                }),
        )
        list_display = ('title', 'path', 'template')
@@ -172,8 +215,11 @@ class PageAdmin(EntityAdmin):
        def get_fieldsets(self, request, obj=None, **kwargs):
                fieldsets = list(self.fieldsets)
                if obj: # if no obj, creating a new page, thus no template set, thus no containers
-                       page = obj
-                       template = page.template
+                       template = obj.template
+                       if template.documentation:
+                               fieldsets.append(('Template Documentation', {
+                                       'description': template.documentation
+                               }))
                        contentlet_containers, contentreference_containers = template.containers
                        for container_name in contentlet_containers:
                                fieldsets.append((('Container: %s' % container_name), {
@@ -227,6 +273,8 @@ 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