Merge branch 'master' into flexible_attributes

[philo.git] / admin / base.py

diff --git a/admin/base.py b/admin/base.py
index b6f47a0..a39756a 100644 (file)
--- a/admin/base.py
+++ b/admin/base.py
@@ -1,16 +1,7 @@
 from django.contrib import admin
 from django.contrib import admin

-#from django.contrib.contenttypes.models import ContentType

 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes import generic

-#from django import forms
-#from django.conf import settings
-#from django.utils.translation import ugettext as _
-#from django.utils.safestring import mark_safe
-#from django.utils.html import escape
-#from django.utils.text import truncate_words
-from philo.models import *
-#from philo.admin import widgets
-#from django.core.exceptions import ValidationError, ObjectDoesNotExist
-#from validators import TreeParentValidator, TreePositionValidator
+from philo.models import Tag, Attribute
+from philo.forms import AttributeForm

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


@@ -21,19 +12,21 @@ 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'
+       template = 'admin/philo/edit_inline/tabular_attribute.html'

        allow_add = True
        allow_add = True

+       classes = COLLAPSE_CLASSES
+       form = AttributeForm
+       exclude = ['value_object_id']

 
 
 
 

-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
+class EntityAdmin(admin.ModelAdmin):
+       inlines = [AttributeInline]
+       save_on_top = True

 
 
 
 

-class EntityAdmin(admin.ModelAdmin):
-       inlines = [AttributeInline, RelationshipInline]
-       save_on_top = True
\ No newline at end of file
+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