Fixed #24128 -- Made admindocs TemplateDetailView respect template_lo…

…aders. Co-Authored-By: Author: Alexander Lazarević <[email protected]>
nessita · Jan 29, 2024 · b7154f8 · b7154f8
1 parent 1df8983
commit b7154f8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/django/contrib/admindocs/views.py b/django/contrib/admindocs/views.py
@@ -404,8 +404,13 @@ def get_context_data(self, **kwargs):
             # Non-trivial TEMPLATES settings aren't supported (#24125).
             pass
         else:
-            # This doesn't account for template loaders (#24128).
-            for index, directory in enumerate(default_engine.dirs):
+            directories = list(default_engine.dirs)
+            for loader in default_engine.template_loaders:
+                if hasattr(loader, "get_dirs"):
+                    for dir_ in loader.get_dirs():
+                        if dir_ not in directories:
+                            directories.append(dir_)
+            for index, directory in enumerate(directories):
                 template_file = Path(safe_join(directory, template))
                 if template_file.exists():
                     template_contents = template_file.read_text()

diff --git a/tests/admin_docs/templates/view_for_loader_test.html b/tests/admin_docs/templates/view_for_loader_test.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Template for Test</title>
+</head>
+<body></body>
+</html>
diff --git a/tests/admin_docs/test_views.py b/tests/admin_docs/test_views.py
@@ -138,6 +138,12 @@ def test_template_detail(self):
             html=True,
         )
 
+    def test_template_detail_loader(self):
+        response = self.client.get(
+            reverse("django-admindocs-templates", args=["view_for_loader_test.html"])
+        )
+        self.assertContains(response, "view_for_loader_test.html</code></li>")
+
     def test_missing_docutils(self):
         utils.docutils_is_available = False
         try: