innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #8971: correctly reverse urls in admindocs reST roles. Thanks, mitsuhiko. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10683 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss 2009-05-07 12:52:02 +00:00
parent f259494f82
commit e5757f9261
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/contrib/admindocs/utils.py
View File

@ -4,6 +4,7 @@ import re
from email.Parser import HeaderParser from email.Parser import HeaderParser
from email.Errors import HeaderParseError from email.Errors import HeaderParseError
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.core.urlresolvers import reverse
try: try:
import docutils.core import docutils.core
import docutils.nodes import docutils.nodes
@ -52,7 +53,7 @@ def parse_docstring(docstring):
body = "\n\n".join(parts[1:]) body = "\n\n".join(parts[1:])
return title, body, metadata 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. 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, 'doctitle_xform' : True,
'inital_header_level' : 3, 'inital_header_level' : 3,
"default_reference_context" : default_reference_context, "default_reference_context" : default_reference_context,
"link_base" : link_base, "link_base" : reverse('django-admindocs-docroot').rstrip('/')
} }
if thing_being_parsed: if thing_being_parsed:
thing_being_parsed = "<%s>" % thing_being_parsed thing_being_parsed = "<%s>" % thing_being_parsed