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

diff --git a/admin/base.py b/admin/base.py
index d9249e5..cb814b7 100644
--- a/admin/base.py
+++ b/admin/base.py
@@ -1,7 +1,8 @@
+from django.conf import settings
 from django.contrib import admin
 from django.contrib.contenttypes import generic
 from philo.models import Tag, Attribute
-from philo.forms import AttributeForm
+from philo.forms import AttributeForm, AttributeInlineFormSet
 
 
 COLLAPSE_CLASSES = ('collapse', 'collapse-closed', 'closed',)
@@ -12,11 +13,15 @@ class AttributeInline(generic.GenericTabularInline):
 	ct_fk_field = 'entity_object_id'
 	model = Attribute
 	extra = 1
-	template = 'admin/philo/edit_inline/tabular_attribute.html'
 	allow_add = True
 	classes = COLLAPSE_CLASSES
 	form = AttributeForm
-	exclude = ['value_object_id']
+	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):
@@ -27,5 +32,6 @@ class EntityAdmin(admin.ModelAdmin):
 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