static: Don't try to render non-template files as templates.
This commit is contained in:
parent
6b1b3b8f2e
commit
93787dc820
1 changed files with 14 additions and 9 deletions
|
@ -1,3 +1,4 @@
|
|||
import mimetypes
|
||||
import os.path
|
||||
from django.http import HttpResponse
|
||||
from django.template import RequestContext, loader
|
||||
|
@ -35,7 +36,6 @@ def fundgoal_lookup(fundraiser_sought):
|
|||
return None
|
||||
|
||||
def index(request, *args, **kwargs):
|
||||
# return HttpResponse("Hello, static world: " + request.get_full_path())
|
||||
path = request.path
|
||||
try:
|
||||
path_bytes = path.encode(FILESYSTEM_ENCODING)
|
||||
|
@ -46,8 +46,12 @@ def index(request, *args, **kwargs):
|
|||
path += u'index.html'
|
||||
fullpath = os.path.join(STATIC_ROOT, path_bytes)
|
||||
if not os.path.exists(fullpath):
|
||||
# return HttpResponse("Sorry that's a 404: " + path)
|
||||
return handler404(request)
|
||||
content_type, _ = mimetypes.guess_type(path)
|
||||
if content_type != 'text/html':
|
||||
content = open(fullpath)
|
||||
else:
|
||||
content_type = None # Let Django use its default
|
||||
template = loader.get_template(path)
|
||||
|
||||
kwargs = kwargs.copy()
|
||||
|
@ -57,7 +61,8 @@ def index(request, *args, **kwargs):
|
|||
kwargs['sitefundgoal'] = fundgoal_lookup('supporterrun')
|
||||
|
||||
context = RequestContext(request, kwargs)
|
||||
return HttpResponse(template.render(context))
|
||||
content = template.render(context)
|
||||
return HttpResponse(content, content_type)
|
||||
|
||||
def debug(request):
|
||||
path = request.get_full_path()
|
||||
|
|
Loading…
Reference in a new issue