Fixed #21846 -- Made NestedObjects handle related_name with %(app_label)s or %(class)s.

1 files changed, 6 insertions, 2 deletions

diff --git a/django/contrib/admin/utils.py b/django/contrib/admin/utils.py
index 4092b67c0e..0b74a6e75f 100644
--- a/django/contrib/admin/utils.py
+++ b/django/contrib/admin/utils.py
@@ -156,10 +156,14 @@ class NestedObjects(Collector):
     def add_edge(self, source, target):
         self.edges.setdefault(source, []).append(target)
 
-    def collect(self, objs, source_attr=None, **kwargs):
+    def collect(self, objs, source=None, source_attr=None, **kwargs):
         for obj in objs:
             if source_attr:
-                self.add_edge(getattr(obj, source_attr), obj)
+                related_name = source_attr % {
+                    'class': source._meta.model_name,
+                    'app_label': source._meta.app_label,
+                }
+                self.add_edge(getattr(obj, related_name), obj)
             else:
                 self.add_edge(None, obj)
         try: