Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.0.X] Fixed #8971: correctly reverse urls in admindocs reST roles. …

…Thanks, mitsuhiko. Backport of [10683] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10685 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 643e914d2b769881504132a9be1cf8efbdc05bd3 1 parent fc15d69
Jacob Kaplan-Moss jacobian authored
Showing with 3 additions and 2 deletions.
  1. +3 −2 django/contrib/admindocs/utils.py
5 django/contrib/admindocs/utils.py
View
@@ -4,6 +4,7 @@
from email.Parser import HeaderParser
from email.Errors import HeaderParseError
from django.utils.safestring import mark_safe
+from django.core.urlresolvers import reverse
try:
import docutils.core
import docutils.nodes
@@ -52,7 +53,7 @@ def parse_docstring(docstring):
body = "\n\n".join(parts[1:])
return title, body, metadata
-def parse_rst(text, default_reference_context, thing_being_parsed=None, link_base='../..'):
+def parse_rst(text, default_reference_context, thing_being_parsed=None):
"""
Convert the string from reST to an XHTML fragment.
"""
@@ -60,7 +61,7 @@ def parse_rst(text, default_reference_context, thing_being_parsed=None, link_bas
'doctitle_xform' : True,
'inital_header_level' : 3,
"default_reference_context" : default_reference_context,
- "link_base" : link_base,
+ "link_base" : reverse('django-admindocs-docroot').rstrip('/')
}
if thing_being_parsed:
thing_being_parsed = "<%s>" % thing_being_parsed
Please sign in to comment.
Something went wrong with that request. Please try again.