Permalink
Browse files

[1.0.X] 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.

Backport of r9602 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent bffb457 commit 4dcff3e684f837d31ab1fcc6f33221d682340745 @malcolmt malcolmt committed Dec 8, 2008
Showing with 2 additions and 1 deletion.
  1. +2 −1 django/contrib/admin/templatetags/admin_list.py
View
3 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><a href="%s"%s>%s</a></%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:

0 comments on commit 4dcff3e

Please sign in to comment.