Commit 1b25433a by Victor Shnayder

Allow error-template-rendering errors to propagate to top-level 500 handler

* hopefully won't come up, but if they do, our 500 page
  should be better than  HttpResponse("There was an unrecoverable error")
parent 44ee0200
...@@ -187,7 +187,10 @@ def index(request, course_id, chapter=None, section=None, ...@@ -187,7 +187,10 @@ def index(request, course_id, chapter=None, section=None,
{'staff_access': staff_access, {'staff_access': staff_access,
'course' : course}) 'course' : course})
except: except:
result = HttpResponse("There was an unrecoverable error") # Let the exception propagate, relying on global config to at
# at least return a nice error message
log.exception("Error while rendering courseware-error page")
raise
return result return result
...@@ -397,7 +400,7 @@ def instructor_dashboard(request, course_id): ...@@ -397,7 +400,7 @@ def instructor_dashboard(request, course_id):
@ensure_csrf_cookie @ensure_csrf_cookie
@cache_control(no_cache=True, no_store=True, must_revalidate=True) @cache_control(no_cache=True, no_store=True, must_revalidate=True)
def enroll_students(request, course_id): def enroll_students(request, course_id):
''' Allows a staff member to enroll students in a course. ''' Allows a staff member to enroll students in a course.
This is a short-term hack for Berkeley courses launching fall This is a short-term hack for Berkeley courses launching fall
2012. In the long term, we would like functionality like this, but 2012. In the long term, we would like functionality like this, but
...@@ -417,20 +420,20 @@ def enroll_students(request, course_id): ...@@ -417,20 +420,20 @@ def enroll_students(request, course_id):
else: else:
new_students = [] new_students = []
new_students = [s.strip() for s in new_students] new_students = [s.strip() for s in new_students]
added_students = [] added_students = []
rejected_students = [] rejected_students = []
for student in new_students: for student in new_students:
try: try:
nce = CourseEnrollment(user=User.objects.get(email = student), course_id = course_id) nce = CourseEnrollment(user=User.objects.get(email = student), course_id = course_id)
nce.save() nce.save()
added_students.append(student) added_students.append(student)
except: except:
rejected_students.append(student) rejected_students.append(student)
return render_to_response("enroll_students.html", {'course':course_id, return render_to_response("enroll_students.html", {'course':course_id,
'existing_students': existing_students, 'existing_students': existing_students,
'added_students': added_students, 'added_students': added_students,
'rejected_students': rejected_students, 'rejected_students': rejected_students,
'debug':new_students}) 'debug':new_students})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment