mirror of
https://github.com/django/django.git
synced 2025-07-04 01:39:20 +00:00
newforms-admin: Fixed #6059. Javascript in the admin is no longer escaped.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
c81b01e060
commit
17dbd788b3
@ -522,7 +522,7 @@ class ModelAdmin(BaseModelAdmin):
|
||||
'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 @@ class ModelAdmin(BaseModelAdmin):
|
||||
'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)
|
||||
|
Loading…
x
Reference in New Issue
Block a user