Merge branch 'master' of git://github.com/melinath/philo

[philo.git] / admin / base.py

diff --git a/admin/base.py b/admin/base.py
index 0383ad4..f8485d2 100644 (file)
--- a/admin/base.py
+++ b/admin/base.py
@@ -1,6 +1,6 @@
 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 Attribute, Relationship
+from philo.models import Tag, Attribute, Relationship

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


@@ -13,6 +13,7 @@ class AttributeInline(generic.GenericTabularInline):
        extra = 1
        template = 'admin/philo/edit_inline/tabular_collapse.html'
        allow_add = True
        extra = 1
        template = 'admin/philo/edit_inline/tabular_collapse.html'
        allow_add = True

+       classes = COLLAPSE_CLASSES

 
 
 class RelationshipInline(generic.GenericTabularInline):
 
 
 class RelationshipInline(generic.GenericTabularInline):


@@ -22,8 +23,15 @@ class RelationshipInline(generic.GenericTabularInline):
        extra = 1
        template = 'admin/philo/edit_inline/tabular_collapse.html'
        allow_add = True
        extra = 1
        template = 'admin/philo/edit_inline/tabular_collapse.html'
        allow_add = True

+       classes = COLLAPSE_CLASSES

 
 
 class EntityAdmin(admin.ModelAdmin):
        inlines = [AttributeInline, RelationshipInline]
 
 
 class EntityAdmin(admin.ModelAdmin):
        inlines = [AttributeInline, RelationshipInline]

-       save_on_top = True
\ No newline at end of file
+       save_on_top = True
+
+
+class TagAdmin(admin.ModelAdmin):
+       prepopulated_fields = {"slug": ("name",)}
+
+admin.site.register(Tag, TagAdmin)
\ No newline at end of file