Fixed #4862 -- Fixed invalid Javascript creation in popup windows in admin.

malcolmt · malcolmt · commit f2a45f9b3883 · 2007-07-14T13:14:28.000Z
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5694 bcc190cf-cafb-0310-a4f2-bffc1f526a37
diff --git a/django/contrib/admin/templatetags/admin_list.py b/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))
 
