Author: jacob
Date: 2009-04-10 12:10:44 -0500 (Fri, 10 Apr 2009)
New Revision: 10491
Modified:
django/branches/releases/1.0.X/django/forms/widgets.py
django/branches/releases/1.0.X/tests/regressiontests/forms/media.py
Log:
[1.0.X] Fixed #10774: accessing form media types in templates (i.e. ``{{
form.media.js }}``) now works. Thanks, tarequeh and Alex Gaynor. Backport of
r10489 from trunk.
Modified: django/branches/releases/1.0.X/django/forms/widgets.py
===================================================================
--- django/branches/releases/1.0.X/django/forms/widgets.py 2009-04-10
17:09:09 UTC (rev 10490)
+++ django/branches/releases/1.0.X/django/forms/widgets.py 2009-04-10
17:10:44 UTC (rev 10491)
@@ -75,7 +75,7 @@
def __getitem__(self, name):
"Returns a Media object that only contains media of the given type"
if name in MEDIA_TYPES:
- return Media(**{name: getattr(self, '_' + name)})
+ return Media(**{str(name): getattr(self, '_' + name)})
raise KeyError('Unknown media type "%s"' % name)
def add_js(self, data):
Modified: django/branches/releases/1.0.X/tests/regressiontests/forms/media.py
===================================================================
--- django/branches/releases/1.0.X/tests/regressiontests/forms/media.py
2009-04-10 17:09:09 UTC (rev 10490)
+++ django/branches/releases/1.0.X/tests/regressiontests/forms/media.py
2009-04-10 17:10:44 UTC (rev 10491)
@@ -355,5 +355,17 @@
<script type="text/javascript" src="/path/to/js4"></script>
<script type="text/javascript" src="/some/form/javascript"></script>
+# Media works in templates
+>>> from django.template import Template, Context
+>>> Template("{{ form.media.js }}{{ form.media.css
}}").render(Context({'form': f3}))
+u'<script type="text/javascript" src="/path/to/js1"></script>
+<script type="text/javascript"
src="http://media.other.com/path/to/js2";></script>
+<script type="text/javascript"
src="https://secure.other.com/path/to/js3";></script>
+<script type="text/javascript" src="/path/to/js4"></script>
+<script type="text/javascript" src="/some/form/javascript"></script><link
href="http://media.example.com/media/path/to/css1"; type="text/css" media="all"
rel="stylesheet" />
+<link href="/path/to/css2" type="text/css" media="all" rel="stylesheet" />
+<link href="/path/to/css3" type="text/css" media="all" rel="stylesheet" />
+<link href="/some/form/css" type="text/css" media="all" rel="stylesheet" />'
+
>>> settings.MEDIA_URL = ORIGINAL_MEDIA_URL
-"""
\ No newline at end of file
+"""
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
