summaryrefslogtreecommitdiff
path: root/chimere/templatetags
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-08-29 19:29:48 +0200
commitef80c8a83e06b4eff26e2be7f35efb92064ce57a (patch)
tree25c815a4e9bf9227a9d5935c88edac80bc272072 /chimere/templatetags
parentb033d05ed1464a6f2fd1aca7e98a00d87970ed5d (diff)
downloadChimère-ef80c8a83e06b4eff26e2be7f35efb92064ce57a.tar.bz2
Chimère-ef80c8a83e06b4eff26e2be7f35efb92064ce57a.zip
Manage auto-detection of multimedia type by extension - improvement on alternate multimedia widget
Diffstat (limited to 'chimere/templatetags')
-rw-r--r--chimere/templatetags/chimere_tags.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py
index b2f045f..99ee0aa 100644
--- a/chimere/templatetags/chimere_tags.py
+++ b/chimere/templatetags/chimere_tags.py
@@ -10,7 +10,7 @@ from django.conf import settings
from django.core.exceptions import ObjectDoesNotExist
from django.core.urlresolvers import reverse
-from chimere.models import Marker, Area, News, SubCategory
+from chimere.models import Marker, Area, News, SubCategory, MultimediaType
from chimere.widgets import get_map_layers
log = getLogger(__name__)
@@ -220,7 +220,8 @@ def multimedia_render(context, multimedia_file):
@register.inclusion_tag('chimere/blocks/alternate_multimedia.html')
def alternate_multimedia(formset_multi, formset_picture):
return {'formsets':[formset_multi, formset_picture],
- "STATIC_URL": settings.STATIC_URL}
+ "STATIC_URL": settings.STATIC_URL,
+ 'auto_type_id':MultimediaType.objects.get(name='auto').pk}
@register.simple_tag
def get_tinyfied_url(marker, area_name=''):