Ticket #12025: t12025_r11366.patch

django/db/models/options.py

@@ -412 +412 @@
                     cache[obj] = parent
                 else:
                     cache[obj] = model
+        from django.contrib.contenttypes import generic            
         for klass in get_models():
             for f in klass._meta.local_many_to_many:
-                if f.rel and not isinstance(f.rel.to, str) and self == f.rel.to._meta:
+                if f.rel and isinstance(f, generic.GenericRelation) and self == klass._meta:
+                    cache[RelatedObject(klass, f.rel.to, f)] = None            
+                elif f.rel and not isinstance(f.rel.to, str) and self == f.rel.to._meta:
                     cache[RelatedObject(f.rel.to, klass, f)] = None
         if app_cache_ready():
             self._related_many_to_many_cache = cache

django/contrib/admin/util.py

@@ -146 +146 @@
                 p = '%s.%s' % (related.opts.app_label, related.opts.get_delete_permission())
                 if not user.has_perm(p):
                     perms_needed.add(related.opts.verbose_name)
+    from django.contrib.contenttypes import generic
     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:
@@ -156 +157 @@
 
         # related.get_accessor_name() could return None for symmetrical relationships
         if rel_opts_name:
-            rel_objs = getattr(obj, rel_opts_name, None)
+            rel_objs = getattr(obj, rel_opts_name, None) or \
+                (isinstance(related.field, generic.GenericRelation) and getattr(obj, related.field.verbose_name, None))                
             if rel_objs:
                 has_related_objs = True