Author: mtredinnick
Date: 2008-12-08 02:24:32 -0600 (Mon, 08 Dec 2008)
New Revision: 9604
Modified:
django/branches/releases/1.0.X/django/contrib/admin/templatetags/admin_list.py
Log:
[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.
Modified:
django/branches/releases/1.0.X/django/contrib/admin/templatetags/admin_list.py
===================================================================
---
django/branches/releases/1.0.X/django/contrib/admin/templatetags/admin_list.py
2008-12-08 08:23:52 UTC (rev 9603)
+++
django/branches/releases/1.0.X/django/contrib/admin/templatetags/admin_list.py
2008-12-08 08:24:32 UTC (rev 9604)
@@ -222,7 +222,8 @@
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:
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
