Context Navigation

Ticket #10119: use_index_html.diff

File use_index_html.diff, 3.8 KB (added by floguy, 16 years ago)

 from django.template import Template, Context, TemplateDoesNotExist
 from django.utils.http import http_date
 def serve(request, path, document_root=None, show_indexes=False):
+def serve(request, path, document_root=None, show_indexes=False, use_index_html=False):
     """
     Serve static files below a given point in the directory structure.
 …
         return HttpResponseRedirect(newpath)
     fullpath = os.path.join(document_root, newpath)
     if os.path.isdir(fullpath):
+        if show_indexes:
+            return directory_index(newpath, fullpath)
+        raise Http404, "Directory indexes are not allowed here."
+        if use_index_html and os.path.exists(os.path.join(fullpath, 'index.html')):
+            fullpath = os.path.join(fullpath, 'index.html')
+        else:
+            if show_indexes:
+                return directory_index(newpath, fullpath)
+            raise Http404, "Directory indexes are not allowed here."
     if not os.path.exists(fullpath):
         raise Http404, '"%s" does not exist' % fullpath
     # Respect the If-Modified-Since header.


	1	<html>
	2	<head><title>Test Page</title></head>
	3	<body><p>This is a test. This is only a test.</p></body>
	4	</html>
	5	No newline at end of file

         response = self.client.get('/views/site_media//%s' % file_name)
         file = open(path.join(media_dir, file_name))
         self.assertEquals(file.read(), response.content)
+    def test_use_index_html(self):
+        response = self.client.get('/views/site_media_index/')
+        file = open(path.join(media_dir, 'index.html'))
+        self.assertEquals(file.read(), response.content)

     # Static views
     (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': media_dir}),
+    (r'^site_media_index/(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': media_dir, 'use_index_html': True}),
+)
 # Date-based generic views.

     the older (no extension) name, but it will prefer a the
     ``directory_index.html`` version.
+Automatically serving index.html
+================================
+Optionally, you can pass the ``use_index_html`` parameter to the
+:func:`~django.views.static.serve` view. This is ``False`` by default. If it's
+``True``, and if the path refers to a directory, Django will look for a file
+inside that directory called ``index.html``.  If it exists, that will be served.
+If it does not exist, either a directory listing will be shown, or an HTTP error
+code 404 will be raised--depending on whether you have enabled ``show_indexes``
+or not.
 Limiting use to DEBUG=True
 ==========================