From 662e12b45ce1cafa3806d8e8dd45638996e91bd7 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 8 Dec 2008 08:16:26 +0000 Subject: [PATCH] The second part of fixing "related inherited models" display. Handle raw_id values for child models in the admin. Fixed #9461. I couldn't think of a way to test this automatically and robustly, however, manual testing with the ticket example shows failure before and success afterwards and the fix make sense logically. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9602 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/templatetags/admin_list.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django/contrib/admin/templatetags/admin_list.py b/django/contrib/admin/templatetags/admin_list.py index 93e9b0799b..37cdb91c3c 100644 --- a/django/contrib/admin/templatetags/admin_list.py +++ b/django/contrib/admin/templatetags/admin_list.py @@ -222,7 +222,8 @@ def items_for_result(cl, result): attr = str(cl.to_field) else: attr = pk - result_id = repr(force_unicode(getattr(result, attr)))[1:] + value = result.serializable_value(attr) + result_id = repr(force_unicode(value))[1:] yield mark_safe(u'<%s%s>%s' % \ (table_tag, row_class, url, (cl.is_popup and ' onclick="opener.dismissRelatedLookupPopup(window, %s); return false;"' % result_id or ''), conditional_escape(result_repr), table_tag)) else: