From 73afcee6ed18d49e49ed831258f77f674e438b3b Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Tue, 26 Aug 2008 07:36:39 +0000 Subject: [PATCH] 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. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8575 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/admin/util.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/contrib/admin/util.py b/django/contrib/admin/util.py index c3f567d9dd..0b6dbf2e6b 100644 --- a/django/contrib/admin/util.py +++ b/django/contrib/admin/util.py @@ -88,7 +88,7 @@ def get_deleted_objects(deleted_objects, perms_needed, user, obj, opts, current_ 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: %s' % @@ -104,7 +104,7 @@ def get_deleted_objects(deleted_objects, perms_needed, user, obj, opts, current_ 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: %s' % \