Author: adrian
Date: 2006-08-18 16:39:29 -0500 (Fri, 18 Aug 2006)
New Revision: 3613
Modified:
django/trunk/django/contrib/admin/views/main.py
Log:
Fixed bug in [3553] -- Changed admin JavaScript quoting for related-object
popup window not to use repr(), because that produces values such as 123L for
longints. Refs #2500
Modified: django/trunk/django/contrib/admin/views/main.py
===================================================================
--- django/trunk/django/contrib/admin/views/main.py 2006-08-18 19:10:46 UTC
(rev 3612)
+++ django/trunk/django/contrib/admin/views/main.py 2006-08-18 21:39:29 UTC
(rev 3613)
@@ -263,7 +263,9 @@
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 @@
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]
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates
-~----------~----~----~----~------~----~------~--~---
