mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

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

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Joseph Kocherhans 2007-11-30 17:53:34 +00:00
parent c81b01e060
commit 17dbd788b3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/admin/options.py
View File

@ -522,7 +522,7 @@ class ModelAdmin(BaseModelAdmin):
'adminform': adminForm, 'adminform': adminForm,
'is_popup': request.REQUEST.has_key('_popup'), 'is_popup': request.REQUEST.has_key('_popup'),
'show_delete': False, 'show_delete': False,
'media': media, 'media': mark_safe(media),
'inline_admin_formsets': inline_admin_formsets, 'inline_admin_formsets': inline_admin_formsets,
}) })
return self.render_change_form(model, c, add=True) return self.render_change_form(model, c, add=True)
@ -597,7 +597,7 @@ class ModelAdmin(BaseModelAdmin):
'object_id': object_id, 'object_id': object_id,
'original': obj, 'original': obj,
'is_popup': request.REQUEST.has_key('_popup'), 'is_popup': request.REQUEST.has_key('_popup'),
'media': media, 'media': mark_safe(media),
'inline_admin_formsets': inline_admin_formsets, 'inline_admin_formsets': inline_admin_formsets,
}) })
return self.render_change_form(model, c, change=True) return self.render_change_form(model, c, change=True)