Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed bug in [3553] -- Changed admin JavaScript quoting for related-o…

…bject popup window not to use repr(), because that produces values such as 123L for longints. Refs #2500

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 64cf4b95a67e6f9911ab67e971c7d57fced9522b 1 parent df20bf5
@adrianholovaty adrianholovaty authored
Showing with 4 additions and 2 deletions.
  1. +4 −2 django/contrib/admin/views/main.py
View
6 django/contrib/admin/views/main.py
@@ -263,7 +263,9 @@ def add_stage(request, app_label, model_name, show_delete=False, form_url='', po
post_url_continue += "?_popup=1"
return HttpResponseRedirect(post_url_continue % pk_value)
if request.POST.has_key("_popup"):
- return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, %r, "%s");</script>' % \
+ 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>' % \
(pk_value, str(new_object).replace('"', '\\"')))
elif request.POST.has_key("_addanother"):
request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name))
@@ -720,7 +722,7 @@ def construct_search(field_name):
return "%s__search" % field_name[1:]
else:
return "%s__icontains" % field_name
-
+
if self.lookup_opts.admin.search_fields and self.query:
for bit in self.query.split():
or_queries = [models.Q(**{construct_search(field_name): bit}) for field_name in self.lookup_opts.admin.search_fields]
Please sign in to comment.
Something went wrong with that request. Please try again.