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

static: Use built-in methods for path manipulation.

Browse source
This commit is contained in:
Brett Smith 2016-11-02 16:45:34 -04:00
parent 9e983208a0
commit 39314c254e
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,10 +3,11 @@ from django.http import HttpResponse
from django.template import RequestContext, loader from django.template import RequestContext, loader
from conservancy.apps.fundgoal.models import FundraisingGoal as FundraisingGoal from conservancy.apps.fundgoal.models import FundraisingGoal as FundraisingGoal
STATIC_ROOT = '/home/www/website/www/conservancy/static/'
def handler(request, errorcode): def handler(request, errorcode):
STATIC_ROOT = '/home/www/website/www/conservancy/static/' path = os.path.join('error', errorcode, 'index.html')
path = 'error/' + errorcode + '/index.html' fullpath = os.path.join(STATIC_ROOT, path)
fullpath = STATIC_ROOT + path
if not os.path.exists(fullpath): if not os.path.exists(fullpath):
return HttpResponse("Internal error: " + path) return HttpResponse("Internal error: " + path)
template = loader.get_template(path) template = loader.get_template(path)
@ -35,11 +36,9 @@ def fundgoal_lookup(fundraiser_sought):
def index(request, *args, **kwargs): def index(request, *args, **kwargs):
# return HttpResponse("Hello, static world: " + request.get_full_path()) # return HttpResponse("Hello, static world: " + request.get_full_path())
path = request.path path = request.path
path = path.lstrip('/') if path.endswith(u'/'):
if path[-1:] == '/': path += u'index.html'
path += 'index.html' fullpath = os.path.join(STATIC_ROOT, path)
STATIC_ROOT = '/home/www/website/www/conservancy/static/'
fullpath = STATIC_ROOT + path
if not os.path.exists(fullpath): if not os.path.exists(fullpath):
# return HttpResponse("Sorry that's a 404: " + path) # return HttpResponse("Sorry that's a 404: " + path)
return handler404(request) return handler404(request)