Changeset 7934 for django/branches/newforms-admin/django/contrib/admindocs/views.py

Timestamp:

07/16/08 08:53:39 (6 months ago)

Author:

brosner

Message:

newforms-admin: Fixed #7466 -- Generate a root_path for admindocs views so the userlinks are properly linked. Thanks handelaar for the report.

Files:

• django/branches/newforms-admin/django/contrib/admindocs/views.py (modified) (10 diffs)

django/branches/newforms-admin/django/contrib/admindocs/views.py

@@ -24 +24 @@
-    if not utils.docutils_is_available:
-        return missing_docutils_page(request)
-
+
+
+
+
-doc_index = staff_member_required(doc_index)
-
@@ -30 +33 @@
-    # Hack! This couples this view to the URL it lives at.
-    admin_root = request.path[:-len('doc/bookmarklets/')]
+    root_path = re.sub(re.escape('doc/bookmarklets/') + '$', '', request.path)
-    return render_to_response('admin_doc/bookmarklets.html', {
+        'root_path': root_path,
-        'admin_url': mark_safe("%s://%s%s" % (request.is_secure() and 'https' or 'http', request.get_host(), admin_root)),
-    }, context_instance=RequestContext(request))
@@ -62 +67 @@
-                'library': tag_library,
-            })
-
-
+
+
+
+
+
-template_tag_index = staff_member_required(template_tag_index)
-
@@ -93 +101 @@
-                'library': tag_library,
-            })
-
+
+
+
+
+
-template_filter_index = staff_member_required(template_filter_index)
-
@@ -121 +133 @@
-                'url': simplify_regex(regex),
-            })
-
+
+
+
+
+
-view_index = staff_member_required(view_index)
-
@@ -140 +156 @@
-    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': root_path,
-        'name': view,
-        'summary': title,
@@ -151 +169 @@
-    if not utils.docutils_is_available:
-        return missing_docutils_page(request)
-
-    m_list = [m._meta for m in models.get_models()]
-
+
+
+
+
+
-model_index = staff_member_required(model_index)
-
@@ -159 +180 @@
-    if not utils.docutils_is_available:
-        return missing_docutils_page(request)
-
+
-    # Get the model class.
-    try:
@@ -226 +247 @@
-            'verbose'   : utils.parse_rst(_("number of %s") % verbose , 'model', _('model:') + opts.module_name),
-        })
-
+
-    return render_to_response('admin_doc/model_detail.html', {
+        'root_path': root_path,
-        'name': '%s.%s' % (opts.app_label, opts.object_name),
-        'summary': _("Fields on %s objects") % opts.object_name,
@@ -253 +275 @@
-                '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': root_path,
-        'name': template,
-        'templates': templates,