Delete confirmation page in Admin displays circular references.

[Ben]

A very minor bug, but also I think easy to fix. The current delete confirmation page in the admin application will display the same object multiple times if there are circular references. e.g. If we have two objects that reference each other with foreign keys then the list of dependent objects to be deleted that is displayed would be-

-object1
    -object2
        -object1
            -object2
etc.

I think it would be better if it only displayed the first object1 and object2.
I have attached a small patch that appears to do this.

[Ben]

A patch.

[Ben Davis]

Updated to not recurse through object being deleted

[Ben Davis]

The original object being deleted should also not be recursed into. This can be easily fixed by adding it to the seen_opts variable at the beginning of the function (as seen in updated patch):

@@ -85,7 +85,7 @@
     nh = _nest_help # Bind to local variable for performance
     if current_depth > 16:
         return # Avoid recursing too deep.
-    opts_seen = []
+    opts_seen += [obj._meta]
     for related in opts.get_all_related_objects():
         has_admin = related.model in admin_site._registry
         if related.opts in opts_seen:

[Alex Gaynor]

This patch still has a mutable default value, which means that the deleted objects will essentially be cached across calls.

[Carl Meyer]

I'm exploring a possible solution for this as part of the fix for #6191.

[Carl Meyer]

This is fixed in the latest patch on #6191.

[Russell Keith-Magee]

(In [12598]) Fixed #6191, #11296 -- Modified the admin deletion confirmation page to use the same object collection scheme as the actual deletion. This ensures that all objects that may be deleted are actually deleted, and that cyclic display problems are avoided. Thanks to carljm for the patch.

[Russell Keith-Magee]

(In [12600]) [1.1.X] Fixed #6191, #11296 -- Modified the admin deletion confirmation page to use the same object collection scheme as the actual deletion. This ensures that all objects that may be deleted are actually deleted, and that cyclic display problems are avoided. Thanks to carljm for the patch.

Backport of r12598 from trunk.

[Jacob]

Milestone 1.2 deleted