Fixed #25058 -- Added GenericRelations with related_query_name to the admin's delete confirmation page.

django/db/models/deletion.py

@@ -231,12 +231,9 @@ class Collector(object):
                         field.remote_field.on_delete(self, field, sub_objs, self.using)
             for field in model._meta.virtual_fields:
                 if hasattr(field, 'bulk_related_objects'):
-                    # Its something like generic foreign key.
+                    # It's something like generic foreign key.
                     sub_objs = field.bulk_related_objects(new_objs, self.using)
-                    self.collect(sub_objs,
+                    self.collect(sub_objs, source=model, nullable=True)
-                                 source=model,
-                                 source_attr=field.remote_field.related_name,
-                                 nullable=True)
 
     def related_objects(self, related, objs):
         """

tests/admin_views/admin.py

@@ -24,9 +24,9 @@ from django.utils.six import StringIO
 from .models import (
     Actor, AdminOrderedAdminMethod, AdminOrderedCallable, AdminOrderedField,
     AdminOrderedModelMethod, Album, Answer, Article, BarAccount, Book,
-    Category, Chapter, ChapterXtra1, Child, ChildOfReferer, Choice, City,
+    Bookmark, Category, Chapter, ChapterXtra1, Child, ChildOfReferer, Choice,
-    Collector, Color, Color2, ComplexSortedPerson, CoverLetter, CustomArticle,
+    City, Collector, Color, Color2, ComplexSortedPerson, CoverLetter,
-    CyclicOne, CyclicTwo, DependentChild, DooHickey, EmptyModel,
+    CustomArticle, CyclicOne, CyclicTwo, DependentChild, DooHickey, EmptyModel,
     EmptyModelHidden, EmptyModelMixin, EmptyModelVisible, ExplicitlyProvidedPK,
     ExternalSubscriber, Fabric, FancyDoodad, FieldOverridePost,
     FilteredManager, FooAccount, FoodDelivery, FunkyTag, Gadget, Gallery,
@@ -912,6 +912,7 @@ site.register(Villain)
 site.register(SuperVillain)
 site.register(Plot)
 site.register(PlotDetails)
+site.register(Bookmark)
 site.register(CyclicOne)
 site.register(CyclicTwo)
 site.register(WorkHour, WorkHourAdmin)

tests/admin_views/models.py

@@ -556,6 +556,15 @@ class SuperSecretHideout(models.Model):
         return self.location
 
 
+@python_2_unicode_compatible
+class Bookmark(models.Model):
+    name = models.CharField(max_length=60)
+    tag = GenericRelation(FunkyTag, related_query_name='bookmark')
+
+    def __str__(self):
+        return self.name
+
+
 @python_2_unicode_compatible
 class CyclicOne(models.Model):
     name = models.CharField(max_length=25)

tests/admin_views/tests.py

@@ -43,21 +43,21 @@ from . import customadmin
 from .admin import CityAdmin, site, site2
 from .models import (
     Actor, AdminOrderedAdminMethod, AdminOrderedCallable, AdminOrderedField,
-    AdminOrderedModelMethod, Answer, Article, BarAccount, Book, Category,
+    AdminOrderedModelMethod, Answer, Article, BarAccount, Book, Bookmark,
-    Chapter, ChapterXtra1, ChapterXtra2, Character, Child, Choice, City,
+    Category, Chapter, ChapterXtra1, ChapterXtra2, Character, Child, Choice,
-    Collector, Color, Color2, ComplexSortedPerson, CoverLetter, CustomArticle,
+    City, Collector, Color, Color2, ComplexSortedPerson, CoverLetter,
-    CyclicOne, CyclicTwo, DooHickey, Employee, EmptyModel, ExternalSubscriber,
+    CustomArticle, CyclicOne, CyclicTwo, DooHickey, Employee, EmptyModel,
-    Fabric, FancyDoodad, FieldOverridePost, FilteredManager, FooAccount,
+    ExternalSubscriber, Fabric, FancyDoodad, FieldOverridePost,
-    FoodDelivery, FunkyTag, Gallery, Grommet, Inquisition, Language,
+    FilteredManager, FooAccount, FoodDelivery, FunkyTag, Gallery, Grommet,
-    MainPrepopulated, ModelWithStringPrimaryKey, OtherStory, Paper, Parent,
+    Inquisition, Language, MainPrepopulated, ModelWithStringPrimaryKey,
-    ParentWithDependentChildren, Person, Persona, Picture, Pizza, Plot,
+    OtherStory, Paper, Parent, ParentWithDependentChildren, Person, Persona,
-    PlotDetails, PluggableSearchPerson, Podcast, Post, PrePopulatedPost, Promo,
+    Picture, Pizza, Plot, PlotDetails, PluggableSearchPerson, Podcast, Post,
-    Question, Recommendation, Recommender, RelatedPrepopulated, Report,
+    PrePopulatedPost, Promo, Question, Recommendation, Recommender,
-    Restaurant, RowLevelChangePermissionModel, SecretHideout, Section,
+    RelatedPrepopulated, Report, Restaurant, RowLevelChangePermissionModel,
-    ShortMessage, Simple, State, Story, Subscriber, SuperSecretHideout,
+    SecretHideout, Section, ShortMessage, Simple, State, Story, Subscriber,
-    SuperVillain, Telegram, TitleTranslation, Topping, UnchangeableObject,
+    SuperSecretHideout, SuperVillain, Telegram, TitleTranslation, Topping,
-    UndeletableObject, UnorderedObject, Villain, Vodcast, Whatsit, Widget,
+    UnchangeableObject, UndeletableObject, UnorderedObject, Villain, Vodcast,
-    Worker, WorkHour,
+    Whatsit, Widget, Worker, WorkHour,
 )
 
 
@@ -2232,6 +2232,19 @@ class AdminViewDeletedObjectsTest(TestCase):
         response = self.client.get(reverse('admin:admin_views_plot_delete', args=(plot.pk,)))
         self.assertContains(response, should_contain)
 
+    def test_generic_relations_with_related_query_name(self):
+        """
+        If a deleted object has GenericForeignKey with
+        GenericRelation(related_query_name='...') pointing to it, those objects
+        should be listed for deletion.
+        """
+        bookmark = Bookmark.objects.create(name='djangoproject')
+        tag = FunkyTag.objects.create(content_object=bookmark, name='django')
+        tag_url = reverse('admin:admin_views_funkytag_change', args=(tag.id,))
+        should_contain = '<li>Funky tag: <a href="%s">django' % tag_url
+        response = self.client.get(reverse('admin:admin_views_bookmark_delete', args=(bookmark.pk,)))
+        self.assertContains(response, should_contain)
+
 
 @override_settings(PASSWORD_HASHERS=['django.contrib.auth.hashers.SHA1PasswordHasher'],
     ROOT_URLCONF="admin_views.urls")