Author: mtredinnick
Date: 2008-08-26 02:36:39 -0500 (Tue, 26 Aug 2008)
New Revision: 8575
Modified:
django/trunk/django/contrib/admin/util.py
Log:
Fixed #6101 -- Tweaked a couple of places in the delete-related-objects
collection for the admin so that auto-escaping can do the right thing: not too
many times, not too few. Thanks to Karen Tracey for debugging most of this.
Modified: django/trunk/django/contrib/admin/util.py
===================================================================
--- django/trunk/django/contrib/admin/util.py 2008-08-26 07:11:14 UTC (rev
8574)
+++ django/trunk/django/contrib/admin/util.py 2008-08-26 07:36:39 UTC (rev
8575)
@@ -88,7 +88,7 @@
if related.field.rel.edit_inline or not has_admin:
# Don't display link to edit, because it either has no
# admin or is edited inline.
- nh(deleted_objects, current_depth, [mark_safe(u'%s: %s' %
(force_unicode(capfirst(related.opts.verbose_name)), sub_obj)), []])
+ nh(deleted_objects, current_depth, [u'%s: %s' %
(force_unicode(capfirst(related.opts.verbose_name)), sub_obj), []])
else:
# Display a link to the admin page.
nh(deleted_objects, current_depth, [mark_safe(u'%s: <a
href="../../../../%s/%s/%s/">%s</a>' %
@@ -104,7 +104,7 @@
if related.field.rel.edit_inline or not has_admin:
# Don't display link to edit, because it either has no
# admin or is edited inline.
- nh(deleted_objects, current_depth, [u'%s: %s' %
(force_unicode(capfirst(related.opts.verbose_name)), escape(sub_obj)), []])
+ nh(deleted_objects, current_depth, [u'%s: %s' %
(force_unicode(capfirst(related.opts.verbose_name)), sub_obj), []])
else:
# Display a link to the admin page.
nh(deleted_objects, current_depth, [mark_safe(u'%s: <a
href="../../../../%s/%s/%s/">%s</a>' % \
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
