Author: jkocherhans
Date: 2007-11-30 11:53:34 -0600 (Fri, 30 Nov 2007)
New Revision: 6779
Modified:
django/branches/newforms-admin/django/contrib/admin/options.py
Log:
newforms-admin: Fixed #6059. Javascript in the admin is no longer escaped.
Modified: django/branches/newforms-admin/django/contrib/admin/options.py
===================================================================
--- django/branches/newforms-admin/django/contrib/admin/options.py
2007-11-30 15:32:01 UTC (rev 6778)
+++ django/branches/newforms-admin/django/contrib/admin/options.py
2007-11-30 17:53:34 UTC (rev 6779)
@@ -522,7 +522,7 @@
'adminform': adminForm,
'is_popup': request.REQUEST.has_key('_popup'),
'show_delete': False,
- 'media': media,
+ 'media': mark_safe(media),
'inline_admin_formsets': inline_admin_formsets,
})
return self.render_change_form(model, c, add=True)
@@ -597,7 +597,7 @@
'object_id': object_id,
'original': obj,
'is_popup': request.REQUEST.has_key('_popup'),
- 'media': media,
+ 'media': mark_safe(media),
'inline_admin_formsets': inline_admin_formsets,
})
return self.render_change_form(model, c, change=True)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
