From c978532f9ac828a812acb6fbb12da978eb55dc28 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Wed, 29 Aug 2012 19:29:48 +0200
Subject: 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
---
 chimere/admin.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'chimere/admin.py')

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)
-- 
cgit v1.2.3