Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #20664 -- Fixed a bug with raw_id_fields on Python 3.

Thanks jefftriplett for the report.
  • Loading branch information...
commit 534ced5aadf964eca4cf29a689dc70185f582772 1 parent c1284c3
@timgraham timgraham authored
View
6 django/contrib/admin/templatetags/admin_list.py
@@ -11,7 +11,7 @@
from django.core.exceptions import ObjectDoesNotExist
from django.db import models
from django.utils import formats
-from django.utils.html import format_html
+from django.utils.html import escapejs, format_html
from django.utils.safestring import mark_safe
from django.utils.text import capfirst
from django.utils.translation import ugettext as _
@@ -226,12 +226,12 @@ def items_for_result(cl, result, form):
else:
attr = pk
value = result.serializable_value(attr)
- result_id = repr(force_text(value))[1:]
+ result_id = escapejs(value)
yield format_html('<{0}{1}><a href="{2}"{3}>{4}</a></{5}>',
table_tag,
row_class,
url,
- format_html(' onclick="opener.dismissRelatedLookupPopup(window, {0}); return false;"', result_id)
+ format_html(' onclick="opener.dismissRelatedLookupPopup(window, &#39;{0}&#39;); return false;"', result_id)
if cl.is_popup else '',
result_repr,
table_tag)
View
8 tests/admin_views/tests.py
@@ -583,6 +583,14 @@ def test_allowed_filtering_15103(self):
response = self.client.get("/test_admin/admin/admin_views/inquisition/?leader__name=Palin&leader__age=27")
self.assertEqual(response.status_code, 200)
+ def test_popup_dismiss_related(self):
+ """
+ Regression test for ticket 20664 - ensure the pk is properly quoted.
+ """
+ actor = Actor.objects.create(name="Palin", age=27)
+ response = self.client.get("/test_admin/admin/admin_views/actor/?%s" % IS_POPUP_VAR)
+ self.assertContains(response, "opener.dismissRelatedLookupPopup(window, &#39;%s&#39;)" % actor.pk)
+
def test_hide_change_password(self):
"""
Tests if the "change password" link in the admin is hidden if the User
Please sign in to comment.
Something went wrong with that request. Please try again.