Ticket #6191: multiple-fk-delete-view.diff

django/contrib/admin/util.py

@@ -85 +85 @@
     nh = _nest_help # Bind to local variable for performance
     if current_depth > 16:
         return # Avoid recursing too deep.
-    opts_seen = []
     for related in opts.get_all_related_objects():
         has_admin = related.model in admin_site._registry
-        if related.opts in opts_seen:
-            continue
-        opts_seen.append(related.opts)
         rel_opts_name = related.get_accessor_name()
         if isinstance(related.field.rel, models.OneToOneRel):
             try:
@@ -148 +144 @@
                     perms_needed.add(related.opts.verbose_name)
     for related in opts.get_all_related_many_to_many_objects():
         has_admin = related.model in admin_site._registry
-        if related.opts in opts_seen:
-            continue
-        opts_seen.append(related.opts)
         rel_opts_name = related.get_accessor_name()
         has_related_objs = False
 

tests/regressiontests/admin_views/tests.py

@@ -18 +18 @@
     ExternalSubscriber, FooAccount, Gallery, ModelWithStringPrimaryKey, \
     Person, Persona, Picture, Podcast, Section, Subscriber, Vodcast, \
     Language, Collector, Widget, Grommet, DooHickey, FancyDoodad, Whatsit, \
-    Category
+    Category, Color, MulticoloredThing
 
 try:
     set
@@ -323 +323 @@
 
         delete_user.user_permissions.add(get_perm(Section,
             Section._meta.get_delete_permission()))
+        delete_user.user_permissions.add(get_perm(Color,
+            Color._meta.get_delete_permission()))
+        delete_user.user_permissions.add(get_perm(MulticoloredThing,
+            MulticoloredThing._meta.get_delete_permission()))
 
         # login POST dicts
         self.super_login = {
@@ -584 +588 @@
         self.failUnlessEqual(logged.object_id, u'1')
         self.client.get('/test_admin/admin/logout/')
 
+    def testDeleteViewWithMultipleForeignKeysToSameTable(self):
+        """Regression for #6191."""
+        red = Color.objects.create(value='Red')
+        thing1 = MulticoloredThing.objects.create(title='Thing 1', background_color=red)
+        self.client.get('/test_admin/admin/')
+        self.client.post('/test_admin/admin/', self.deleteuser_login)
+        response = self.client.get('/test_admin/admin/admin_views/color/%d/delete/' % red.id)
+        self.assertContains(response, 'admin_views/multicoloredthing/%d/' % thing1.id)
+
 class AdminViewStringPrimaryKeyTest(TestCase):
     fixtures = ['admin-views-users.xml', 'string-primary-key.xml']
 
@@ -1605 +1618 @@
         "Check the never-cache status of the Javascript i18n view"
         response = self.client.get('/test_admin/jsi18n/')
         self.failUnlessEqual(get_max_age(response), None)
-

tests/regressiontests/admin_views/models.py

@@ -138 +138 @@
 class ThingAdmin(admin.ModelAdmin):
     list_filter = ('color',)
 
+class MulticoloredThing(models.Model):
+    title = models.CharField(max_length=20)
+    foreground_color = models.ForeignKey(Color, related_name='thing_foreground', blank=True, null=True)
+    background_color = models.ForeignKey(Color, related_name='thing_background', blank=True, null=True)
+    def __unicode__(self):
+        return self.title
+
 class Fabric(models.Model):
     NG_CHOICES = (
         ('Textured', (
@@ -426 +433 @@
 admin.site.register(ModelWithStringPrimaryKey)
 admin.site.register(Color)
 admin.site.register(Thing, ThingAdmin)
+admin.site.register(MulticoloredThing)
 admin.site.register(Person, PersonAdmin)
 admin.site.register(Persona, PersonaAdmin)
 admin.site.register(Subscriber, SubscriberAdmin)