summaryrefslogtreecommitdiff
path: root/chimere/admin.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2012-08-29 19:29:48 +0200
committerÉtienne Loks <etienne.loks@peacefrogs.net>2012-11-26 15:53:31 +0100
commitc978532f9ac828a812acb6fbb12da978eb55dc28 (patch)
tree5947d874f1e7e6c0b311075c23a49338e48bb851 /chimere/admin.py
parent8a4293f93328ad4aca63a9019f68b41e004fbf18 (diff)
downloadChimère-c978532f9ac828a812acb6fbb12da978eb55dc28.tar.bz2
Chimère-c978532f9ac828a812acb6fbb12da978eb55dc28.zip
Manage auto-detection of multimedia type by extension - improvement on alternate multimedia widget
Conflicts: chimere/admin.py chimere/forms.py chimere/models.py chimere/templates/chimere/blocks/alternate_multimedia.html chimere/templatetags/chimere_tags.py
Diffstat (limited to 'chimere/admin.py')
-rw-r--r--chimere/admin.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/chimere/admin.py b/chimere/admin.py
index 1d3dcbe..147314e 100644
--- a/chimere/admin.py
+++ b/chimere/admin.py
@@ -387,6 +387,12 @@ class ColorThemeAdmin(admin.ModelAdmin):
class IconAdmin(admin.ModelAdmin):
exclude = ['height', 'width']
+class PropertyModelChoiceInline(admin.TabularInline):
+ model = PropertyModelChoice
+ extra = 1
+class PropertyModelAdmin(admin.ModelAdmin):
+ inlines = [PropertyModelChoiceInline]
+
# register of differents database fields
admin.site.register(News, NewsAdmin)
admin.site.register(Category, CategoryAdmin)