Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #4862 -- Fixed invalid Javascript creation in popup windows in …

…admin.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit f2a45f9b3883f974d2b48eb05612ff4e9b9b2946 1 parent 501448e
@malcolmt malcolmt authored
Showing with 4 additions and 2 deletions.
  1. +4 −2 django/contrib/admin/templatetags/admin_list.py
View
6 django/contrib/admin/templatetags/admin_list.py
@@ -190,9 +190,11 @@ def items_for_result(cl, result):
table_tag = {True:'th', False:'td'}[first]
first = False
url = cl.url_for_result(result)
- result_id = smart_unicode(getattr(result, pk)) # conversion to string is needed in case of 23L (long ints)
+ # Convert the pk to something that can be used in Javascript.
+ # Problem cases are long ints (23L) and non-ASCII strings.
+ result_id = repr(force_unicode(getattr(result, pk)))[1:]
yield (u'<%s%s><a href="%s"%s>%s</a></%s>' % \
- (table_tag, row_class, url, (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %r); return false;"' % result_id or ''), result_repr, table_tag))
+ (table_tag, row_class, url, (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %s); return false;"' % result_id or ''), result_repr, table_tag))
else:
yield (u'<td%s>%s</td>' % (row_class, result_repr))
Please sign in to comment.
Something went wrong with that request. Please try again.