diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-05-07 12:54:33 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-05-07 12:54:33 +0000 |
| commit | 643e914d2b769881504132a9be1cf8efbdc05bd3 (patch) | |
| tree | 6ec28469d62b31090ba8ce72559d46df2fc2e1a3 | |
| parent | fc15d690b1c33a3ead51bf420db1d67e9045e631 (diff) | |
[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
| -rw-r--r-- | django/contrib/admindocs/utils.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/django/contrib/admindocs/utils.py b/django/contrib/admindocs/utils.py index 4a45a622b2..24228541f6 100644 --- a/django/contrib/admindocs/utils.py +++ b/django/contrib/admindocs/utils.py @@ -4,6 +4,7 @@ import re 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 |