X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/c8256e579ea1a9e840619e1dade8f18353db7973..a8309d6b25f3b52df735a4c2afbe65c77c69bca0:/admin.py diff --git a/admin.py b/admin.py index 1566c5b..64893d5 100644 --- a/admin.py +++ b/admin.py @@ -12,12 +12,15 @@ 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,8 +42,9 @@ 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): @@ -48,11 +52,42 @@ class CollectionAdmin(admin.ModelAdmin): list_display = ('name', 'description', 'get_count') +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 += '%s' % (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() + instance_class = self.get_instance_class() if instance_class is not None: try: @@ -83,57 +118,6 @@ class TreeForm(forms.ModelForm): return cleaned_data -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 - list_display = ('__unicode__', 'slug', 'get_path',) - form = TreeForm - - -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 += '%s' % (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 NodeForm(TreeForm): def get_instance_class(self): return Node @@ -144,28 +128,59 @@ class NodeForm(TreeForm): class PageAdminForm(NodeForm): class Meta: - model=Page + model = Page class RedirectAdminForm(NodeForm): class Meta: - model=Redirect + model = Redirect class FileAdminForm(NodeForm): class Meta: - model=File + model = File -class PageAdmin(EntityAdmin): +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') @@ -176,8 +191,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), { @@ -231,23 +249,34 @@ 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', '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_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)