Commit 73afcee6 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

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
parent af83b650

django/contrib/admin/util.py

+2 −2
Original line number Diff line number Diff line
@@ -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: <a href="../../../../%s/%s/%s/">%s</a>' %
@@ -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: <a href="../../../../%s/%s/%s/">%s</a>' % \