Ticket #6962: newforms-admin-admindocs.diff

django/contrib/admin/sites.py

@@ -124 +124 @@
             return self.password_change_done(request)
         elif url == 'jsi18n':
             return self.i18n_javascript(request)
+        # urls starting with 'doc/' are for the admindocs
+        elif url.startswith('doc'):
+            from django.contrib.admindocs.urls import urlpatterns as _patterns
+            if url=="doc":
+                url = ''
+            else:
+                url = url[4:]+'/'
+            for pattern in _patterns:
+                match = pattern.resolve(url)
+                if match:
+                    return match[0](request, *match[1], **match[2])
         # urls starting with 'r/' are for the "show in web" links
         elif url.startswith('r/'):
             from django.views.defaults import shortcut