X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/abb612415838c36da12f53560a2546ae8c43abdd..47e6d542650e61e998e8b8d2195755c3eeec2037:/admin.py
diff --git a/admin.py b/admin.py
index 12b9183..49134e1 100644
--- a/admin.py
+++ b/admin.py
@@ -2,7 +2,17 @@ from django.contrib import admin
from django.contrib.contenttypes import generic
from django.contrib.contenttypes.models import ContentType
from django import forms
-from models import *
+from django.conf import settings
+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 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):
@@ -10,7 +20,7 @@ class AttributeInline(generic.GenericTabularInline):
ct_fk_field = 'entity_object_id'
model = Attribute
extra = 1
- classes = ('collapse-closed',)
+ template = 'admin/philo/edit_inline/tabular_collapse.html'
allow_add = True
@@ -19,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
@@ -32,56 +42,160 @@ 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 TemplateAdmin(admin.ModelAdmin):
- prepopulated_fields = {'slug': ('name',)}
+class NodeAdmin(EntityAdmin):
+ pass
+
+
+class ModelLookupWidget(forms.TextInput):
+ # is_hidden = False
+
+ def __init__(self, content_type, attrs=None):
+ self.content_type = content_type
+ super(ModelLookupWidget, self).__init__(attrs)
+
+ def render(self, name, value, attrs=None):
+ related_url = '../../../%s/%s/' % (self.content_type.app_label, self.content_type.model)
+ if attrs is None:
+ attrs = {}
+ if not attrs.has_key('class'):
+ attrs['class'] = 'vForeignKeyRawIdAdminField'
+ output = super(ModelLookupWidget, self).render(name, value, attrs)
+ output += '' % (related_url, name)
+ output += '' % (settings.ADMIN_MEDIA_PREFIX, _('Lookup'))
+ output += ''
+ if value:
+ value_class = self.content_type.model_class()
+ try:
+ value_object = value_class.objects.get(pk=value)
+ output += ' %s' % escape(truncate_words(value_object, 14))
+ except value_class.DoesNotExist:
+ pass
+ return mark_safe(output)
+
+
+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 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 RedirectAdmin(NodeAdmin):
fieldsets = (
(None, {
- 'fields': ('parent', 'name', 'slug')
+ 'fields': ('slug', 'target', 'status_code')
}),
- ('Documentation', {
- 'classes': ('collapse', 'collapse-closed'),
- 'fields': ('documentation',)
+ ('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': ('code',)
+ 'fields': ('file', 'slug', 'mimetype')
}),
- ('Advanced', {
- 'classes': ('collapse','collapse-closed'),
- 'fields': ('mimetype',)
+ ('URL/Tree/Hierarchy', {
+ 'classes': COLLAPSE_CLASSES,
+ 'fields': ('parent',)
}),
)
- save_on_top = True
- save_as = True
+ form=FileAdminForm
+ list_display=('slug', 'mimetype', 'path', 'file',)
-class PageAdmin(EntityAdmin):
+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')
list_filter = ('template',)
search_fields = ['title', 'slug', 'contentlets__content']
+ form = PageAdminForm
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), {
@@ -113,10 +227,10 @@ class PageAdmin(EntityAdmin):
for container_name, container_content_type in contentreference_containers:
initial_content = None
try:
- initial_content = page.contentreferences.get(name__exact=container_name, content_type=container_content_type)
+ initial_content = page.contentreferences.get(name__exact=container_name, content_type=container_content_type).content.pk
except ContentReference.DoesNotExist:
pass
- form.base_fields[('contentreference_container_%s' % container_name)] = forms.ModelChoiceField(label='References', initial=initial_content, required=False, queryset=container_content_type.model_class().objects.all())
+ form.base_fields[('contentreference_container_%s' % container_name)] = forms.ModelChoiceField(label='References', widget=ModelLookupWidget(container_content_type), initial=initial_content, required=False, queryset=container_content_type.model_class().objects.all())
return form
def save_model(self, request, page, form, change):
@@ -135,14 +249,40 @@ 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 TemplateAdmin(admin.ModelAdmin):
+ prepopulated_fields = {'slug': ('name',)}
+ fieldsets = (
+ (None, {
+ 'fields': ('parent', 'name', 'slug')
+ }),
+ ('Documentation', {
+ 'classes': COLLAPSE_CLASSES,
+ 'fields': ('documentation',)
+ }),
+ (None, {
+ 'fields': ('code',)
+ }),
+ ('Advanced', {
+ 'classes': COLLAPSE_CLASSES,
+ 'fields': ('mimetype',)
+ }),
+ )
+ save_on_top = True
+ save_as = True
+ list_display = ('__unicode__', 'slug', 'get_path',)
+ form = TreeForm
+
+
admin.site.register(Collection, CollectionAdmin)
-admin.site.register(Redirect)
-admin.site.register(File)
+admin.site.register(Redirect, RedirectAdmin)
+admin.site.register(File, FileAdmin)
admin.site.register(Page, PageAdmin)
admin.site.register(Template, TemplateAdmin)