X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/e17036efc3c8f292703647fc34c79a6610710942..2b5ce98a189f8e69495ade8fc4bef89311e4922b:/admin/base.py

diff --git a/admin/base.py b/admin/base.py
index b7c93d7..cb814b7 100644
--- a/admin/base.py
+++ b/admin/base.py
@@ -1,6 +1,8 @@
+from django.conf import settings
 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',)
@@ -11,23 +13,19 @@ class AttributeInline(generic.GenericTabularInline):
 	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'
 	allow_add = True
 	classes = COLLAPSE_CLASSES
+	form = AttributeForm
+	formset = AttributeInlineFormSet
+	fields = ['key', 'value_content_type']
+	if 'grappelli' in settings.INSTALLED_APPS:
+		template = 'admin/philo/edit_inline/grappelli_tabular_attribute.html'
+	else:
+		template = 'admin/philo/edit_inline/tabular_attribute.html'
 
 
 class EntityAdmin(admin.ModelAdmin):
-	inlines = [AttributeInline, RelationshipInline]
+	inlines = [AttributeInline]
 	save_on_top = True