Tweaked philo migrations to force contenttype creation after migration 0005 so the...

[philo.git] / admin / base.py

diff --git a/admin/base.py b/admin/base.py
index 46c7c22..f4a5f2f 100644 (file)
--- a/admin/base.py
+++ b/admin/base.py
@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django.contrib.contenttypes import generic
 from django.contrib import admin
 from django.contrib.contenttypes import generic

-from philo.models import Tag, Attribute, Relationship
+from philo.models import Tag, Attribute
+from philo.forms import AttributeForm, AttributeInlineFormSet

 
 
 COLLAPSE_CLASSES = ('collapse', 'collapse-closed', 'closed',)
 
 
 COLLAPSE_CLASSES = ('collapse', 'collapse-closed', 'closed',)


@@ -11,28 +12,22 @@ class AttributeInline(generic.GenericTabularInline):
        ct_fk_field = 'entity_object_id'
        model = Attribute
        extra = 1
        ct_fk_field = 'entity_object_id'
        model = Attribute
        extra = 1

-       template = 'admin/philo/edit_inline/tabular_collapse.html'
-       allow_add = True
-       classes = COLLAPSE_CLASSES
-
-
-class RelationshipInline(generic.GenericTabularInline):
-       ct_field = 'entity_content_type'
-       ct_fk_field = 'entity_object_id'
-       model = Relationship
-       extra = 1
-       template = 'admin/philo/edit_inline/tabular_collapse.html'
+       template = 'admin/philo/edit_inline/tabular_attribute.html'

        allow_add = True
        classes = COLLAPSE_CLASSES
        allow_add = True
        classes = COLLAPSE_CLASSES

+       form = AttributeForm
+       formset = AttributeInlineFormSet
+       exclude = ['value_object_id']

 
 
 class EntityAdmin(admin.ModelAdmin):
 
 
 class EntityAdmin(admin.ModelAdmin):

-       inlines = [AttributeInline, RelationshipInline]
+       inlines = [AttributeInline]

        save_on_top = True
 
 
 class TagAdmin(admin.ModelAdmin):
        list_display = ('name', 'slug')
        prepopulated_fields = {"slug": ("name",)}
        save_on_top = True
 
 
 class TagAdmin(admin.ModelAdmin):
        list_display = ('name', 'slug')
        prepopulated_fields = {"slug": ("name",)}

+       search_fields = ["name"]

 
 admin.site.register(Tag, TagAdmin)
\ No newline at end of file
 
 admin.site.register(Tag, TagAdmin)
\ No newline at end of file