Permalink
Browse files

newforms-admin: Fixed #6059. Javascript in the admin is no longer esc…

…aped.

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent c81b01e commit 17dbd788b3c94ee286eba9318d4071fa386c78a6 @jkocherhans jkocherhans committed Nov 30, 2007
Showing with 2 additions and 2 deletions.
  1. +2 −2 django/contrib/admin/options.py
@@ -522,7 +522,7 @@ def add_view(self, request, form_url=''):
'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 @@ def change_view(self, request, object_id):
'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)

0 comments on commit 17dbd78

Please sign in to comment.