Permalink
Browse files

newforms-admin: Fixed #6100 -- Related field popup window now closes …

…properly after saving. Thanks oggie_rob and Gary Wilson.

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7194 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent a88c887 commit fb3994bdfc296701ed156adbba9e898e17fa1c03 @brosner brosner committed Mar 5, 2008
Showing with 1 addition and 3 deletions.
  1. +1 −3 django/contrib/admin/options.py
View
4 django/contrib/admin/options.py
@@ -383,9 +383,7 @@ def save_add(self, request, model, form, formsets, post_url_continue):
post_url_continue += "?_popup=1"
return HttpResponseRedirect(post_url_continue % pk_value)
if request.POST.has_key("_popup"):
- if type(pk_value) is str: # Quote if string, so JavaScript doesn't think it's a variable.
- pk_value = '"%s"' % pk_value.replace('"', '\\"')
- return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, %s, "%s");</script>' % \
+ return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \
# escape() calls force_unicode.
(escape(pk_value), escape(new_object)))
elif request.POST.has_key("_addanother"):

0 comments on commit fb3994b

Please sign in to comment.