Changeset 3213

Timestamp:

06/26/06 18:01:46 (2 years ago)

Author:

adrian

Message:

Fixed #2157 -- Admin doc views now work if django.contrib.sites isn't installed

Files:

• django/trunk/django/contrib/admin/views/doc.py (modified) (5 diffs)

django/trunk/django/contrib/admin/views/doc.py

@@ -14 +14 @@
-# Exclude methods starting with these strings from documentation
-MODEL_METHODS_EXCLUDE = ('_', 'add_', 'delete', 'save', 'set_')
+
+class GenericSite(object):
+    domain = 'example.com'
+    name = 'my site'
-
-def doc_index(request):
@@ -103 +107 @@
-        urlconf = __import__(settings_mod.ROOT_URLCONF, '', '', [''])
-        view_functions = extract_views_from_urlpatterns(urlconf.urlpatterns)
+        if Site._meta.installed:
+            site_obj = Site.objects.get(pk=settings_mod.SITE_ID)
+        else:
+            site_obj = GenericSite()
-        for (func, regex) in view_functions:
-            views.append({
@@ -108 +116 @@
-                'module': func.__module__,
-                'site_id': settings_mod.SITE_ID,
-Site.objects.get(pk=settings_mod.SITE_ID)
+site_obj
-                'url': simplify_regex(regex),
-            })
@@ -229 +237 @@
-    for site_settings_module in settings.ADMIN_FOR:
-        settings_mod = __import__(site_settings_module, '', '', [''])
+        if Site._meta.installed:
+            site_obj = Site.objects.get(pk=settings_mod.SITE_ID)
+        else:
+            site_obj = GenericSite()
-        for dir in settings_mod.TEMPLATE_DIRS:
-            template_file = os.path.join(dir, "%s.html" % template)
@@ -236 +248 @@
-                'contents': lambda: os.path.exists(template_file) and open(template_file).read() or '',
-                'site_id': settings_mod.SITE_ID,
-Site.objects.get(pk=settings_mod.SITE_ID)
+site_obj
-                'order': list(settings_mod.TEMPLATE_DIRS).index(dir),
-            })