X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/e06925fc9be46b2c07863440212600b2e7ecb597..74ceac458ad030558f2e564ba34191115d0aadc5:/admin/base.py

diff --git a/admin/base.py b/admin/base.py
index f8485d2..3b2deba 100644
--- a/admin/base.py
+++ b/admin/base.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from django.contrib.contenttypes import generic
-from philo.models import Tag, Attribute, Relationship
+from philo.models import Tag, Attribute
 
 
 COLLAPSE_CLASSES = ('collapse', 'collapse-closed', 'closed',)
@@ -16,22 +16,23 @@ class AttributeInline(generic.GenericTabularInline):
 	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
+#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
 
 
 class EntityAdmin(admin.ModelAdmin):
-	inlines = [AttributeInline, RelationshipInline]
+	inlines = [AttributeInline] #, RelationshipInline]
 	save_on_top = True
 
 
 class TagAdmin(admin.ModelAdmin):
+	list_display = ('name', 'slug')
 	prepopulated_fields = {"slug": ("name",)}
 
 admin.site.register(Tag, TagAdmin)
\ No newline at end of file