From 1c1034c63ba8ba75239e3084fbaa97107bd76f51 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Thu, 3 Jan 2013 13:47:03 -0500 Subject: [PATCH] Pass location as a parameter, not as a part of the url --- lms/djangoapps/open_ended_grading/views.py | 7 ++++++- lms/urls.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lms/djangoapps/open_ended_grading/views.py b/lms/djangoapps/open_ended_grading/views.py index 6d41d47812..1026888987 100644 --- a/lms/djangoapps/open_ended_grading/views.py +++ b/lms/djangoapps/open_ended_grading/views.py @@ -71,6 +71,7 @@ def peer_grading(request, course_id): # call problem list service success = False error_text = "" + problem_list = [] try: problem_list_text = peer_gs.get_problem_list(course_id, request.user.id) problem_list_json = json.loads(problem_list_text) @@ -83,6 +84,9 @@ def peer_grading(request, course_id): except GradingServiceError: error_text = "Error occured while contacting the grading service" success = False + except ValueError: + error_text = "Could not get problem list" + success = False ajax_url = reverse('peer_grading', kwargs={'course_id': course_id}) if not ajax_url.endswith('/'): @@ -100,11 +104,12 @@ def peer_grading(request, course_id): 'staff_access': False, }) -def peer_grading_problem(request, course_id, problem_location): +def peer_grading_problem(request, course_id): ''' Show individual problem interface ''' course = get_course_with_access(request.user, course_id, 'load') + problem_location = request.GET.get("location") ajax_url = reverse('peer_grading', kwargs={'course_id': course_id}) if not ajax_url.endswith('/'): diff --git a/lms/urls.py b/lms/urls.py index ed12aa9682..5bc55d6f10 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -255,7 +255,7 @@ if settings.COURSEWARE_ENABLED: # Peer Grading url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/peer_grading$', 'open_ended_grading.views.peer_grading', name='peer_grading'), - url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/peer_grading/problem/(?P.*)$', + url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/peer_grading/problem$', 'open_ended_grading.views.peer_grading_problem', name='peer_grading_problem'), url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/peer_grading/get_next_submission$', 'open_ended_grading.peer_grading_service.get_next_submission', name='peer_grading_get_next_submission'),