Changeset 8718

Timestamp:

08/29/08 14:29:16 (3 months ago)

Author:

jacob

Message:

Fixed #7466: do a better job figuring out links from the admin docs into the rest of the admin.

Files:

• django/trunk/django/contrib/admindocs/views.py (modified) (8 diffs)

django/trunk/django/contrib/admindocs/views.py

@@ -21 +21 @@
-    name = 'my site'
-
+def get_root_path():
+    from django.contrib import admin
+    try:
+        return urlresolvers.reverse(admin.site.root, args=[''])
+    except urlresolvers.NoReverseMatch:
+        return getattr(settings, "ADMIN_SITE_ROOT_URL", "/admin/")
+
-def doc_index(request):
-    if not utils.docutils_is_available:
-        return missing_docutils_page(request)
-    root_path = re.sub(re.escape('doc/') + '$', '', request.path)
-    return render_to_response('admin_doc/index.html', {
-root_path
+get_root_path()
-    }, context_instance=RequestContext(request))
-doc_index = staff_member_required(doc_index)
-
-def bookmarklets(request):
-
-
-
+
-    return render_to_response('admin_doc/bookmarklets.html', {
-root_path
+admin_root
-        'admin_url': mark_safe("%s://%s%s" % (request.is_secure() and 'https' or 'http', request.get_host(), admin_root)),
-    }, context_instance=RequestContext(request))
@@ -67 +71 @@
-                'library': tag_library,
-            })
-    root_path = re.sub(re.escape('doc/tags/') + '$', '', request.path)
-    return render_to_response('admin_doc/template_tag_index.html', {
-root_path
+get_root_path()
-        'tags': tags
-    }, context_instance=RequestContext(request))
@@ -101 +104 @@
-                'library': tag_library,
-            })
-    root_path = re.sub(re.escape('doc/filters/') + '$', '', request.path)
-    return render_to_response('admin_doc/template_filter_index.html', {
-root_path
+get_root_path()
-        'filters': filters
-    }, context_instance=RequestContext(request))
@@ -133 +135 @@
-                'url': simplify_regex(regex),
-            })
-    root_path = re.sub(re.escape('doc/views/') + '$', '', request.path)
-    return render_to_response('admin_doc/view_index.html', {
-root_path
+get_root_path()
-        'views': views
-    }, context_instance=RequestContext(request))
@@ -156 +157 @@
-    for key in metadata:
-        metadata[key] = utils.parse_rst(metadata[key], 'model', _('view:') + view)
-    root_path = re.sub(re.escape('doc/views/%s/' % view) + '$', '', request.path)
-    return render_to_response('admin_doc/view_detail.html', {
-root_path
+get_root_path()
-        'name': view,
-        'summary': title,
@@ -170 +170 @@
-        return missing_docutils_page(request)
-    m_list = [m._meta for m in models.get_models()]
-    root_path = re.sub(re.escape('doc/models/') + '$', '', request.path)
-    return render_to_response('admin_doc/model_index.html', {
-root_path
+get_root_path()
-        'models': m_list
-    }, context_instance=RequestContext(request))
@@ -247 +246 @@
-            'verbose'   : utils.parse_rst(_("number of %s") % verbose , 'model', _('model:') + opts.module_name),
-        })
-    root_path = re.sub(re.escape('doc/models/%s.%s/' % (app_label, model_name)) + '$', '', request.path)
-    return render_to_response('admin_doc/model_detail.html', {
-root_path
+get_root_path()
-        'name': '%s.%s' % (opts.app_label, opts.object_name),
-        'summary': _("Fields on %s objects") % opts.object_name,
@@ -275 +273 @@
-                'order': list(settings_mod.TEMPLATE_DIRS).index(dir),
-            })
-    root_path = re.sub(re.escape('doc/templates/%s/' % template) + '$', '', request.path)
-    return render_to_response('admin_doc/template_detail.html', {
-root_path
+get_root_path()
-        'name': template,
-        'templates': templates,