Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

static: Don't try to render non-template files as templates.

Browse source
This commit is contained in:
Brett Smith 2016-11-02 16:47:13 -04:00
parent 6b1b3b8f2e
commit 93787dc820
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
www/conservancy/static/views.py
View file

@ -1,3 +1,4 @@
import mimetypes
import os.path import os.path
from django.http import HttpResponse from django.http import HttpResponse
from django.template import RequestContext, loader from django.template import RequestContext, loader
@ -35,7 +36,6 @@ def fundgoal_lookup(fundraiser_sought):
return None return None
def index(request, *args, **kwargs): def index(request, *args, **kwargs):
# return HttpResponse("Hello, static world: " + request.get_full_path())
path = request.path path = request.path
try: try:
path_bytes = path.encode(FILESYSTEM_ENCODING) path_bytes = path.encode(FILESYSTEM_ENCODING)
@ -46,18 +46,23 @@ def index(request, *args, **kwargs):
path += u'index.html' path += u'index.html'
fullpath = os.path.join(STATIC_ROOT, path_bytes) fullpath = os.path.join(STATIC_ROOT, path_bytes)
if not os.path.exists(fullpath): if not os.path.exists(fullpath):
# return HttpResponse("Sorry that's a 404: " + path)
return handler404(request) return handler404(request)
template = loader.get_template(path) 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() kwargs = kwargs.copy()
if kwargs.has_key('fundraiser_sought'): if kwargs.has_key('fundraiser_sought'):
kwargs['fundgoal'] = fundgoal_lookup(kwargs['fundraiser_sought']) kwargs['fundgoal'] = fundgoal_lookup(kwargs['fundraiser_sought'])
kwargs['sitefundgoal'] = fundgoal_lookup('supporterrun') kwargs['sitefundgoal'] = fundgoal_lookup('supporterrun')
context = RequestContext(request, kwargs) context = RequestContext(request, kwargs)
return HttpResponse(template.render(context)) content = template.render(context)
return HttpResponse(content, content_type)
def debug(request): def debug(request):
path = request.get_full_path() path = request.get_full_path()