Merge branch 'master' into #2

barnabytprowe · Dec 3, 2013 · e8f684c · e8f684c
2 parents 12b338a + 77e8642
commit e8f684c
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/great3/leaderboard/data_views.py b/great3/leaderboard/data_views.py
@@ -19,8 +19,11 @@ def index(request):
 @login_required
 def admin_file(request, filename):
 	if not request.user.is_staff:
-		raise django.http.Http404		
-	dataFile = AdminDataFile.objects.get(filename=filename)
+		raise django.http.Http404
+	try:
+		dataFile = AdminDataFile.objects.get(filename=filename)
+	except AdminDataFile.DoesNotExist:
+		raise django.http.Http404
 	abs_filename = dataFile.abspath
 	response = django.http.HttpResponse()
 	del response['content-type']
@@ -29,7 +32,10 @@ def admin_file(request, filename):
 
 
 def public_file(request, filename):
-	dataFile = PublicDataFile.objects.get(filename=filename)
+	try:
+		dataFile = PublicDataFile.objects.get(filename=filename)
+	except PublicDataFile.DoesNotExist:
+		raise django.http.Http404
 	abs_filename = dataFile.abspath
 	response = django.http.HttpResponse()
 	del response['content-type']