[1.0.X] Fixed #9754: static-serving view now uses correct template name for directory indexes. Was [9566] in trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9567 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
James Bennett 2008-12-04 19:34:23 +00:00
parent c667fdd4d8
commit c1ec41a91a
1 changed files with 3 additions and 2 deletions

View File

@ -28,7 +28,7 @@ def serve(request, path, document_root=None, show_indexes=False):
also set ``show_indexes`` to ``True`` if you'd like to serve a basic index also set ``show_indexes`` to ``True`` if you'd like to serve a basic index
of the directory. This index view will use the template hardcoded below, of the directory. This index view will use the template hardcoded below,
but if you'd like to override it, you can create a template called but if you'd like to override it, you can create a template called
``static/directory_index``. ``static/directory_index.html``.
""" """
# Clean up given path to only allow serving files below document_root. # Clean up given path to only allow serving files below document_root.
@ -91,7 +91,8 @@ DEFAULT_DIRECTORY_INDEX_TEMPLATE = """
def directory_index(path, fullpath): def directory_index(path, fullpath):
try: try:
t = loader.get_template('static/directory_index') t = loader.get_template('static/directory_index.html
')
except TemplateDoesNotExist: except TemplateDoesNotExist:
t = Template(DEFAULT_DIRECTORY_INDEX_TEMPLATE, name='Default directory index template') t = Template(DEFAULT_DIRECTORY_INDEX_TEMPLATE, name='Default directory index template')
files = [] files = []