From 0f71f5b92ef7e6b46e37c1c15fb152f8c4f59af2 Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Mon, 11 Feb 2013 17:36:33 -0500 Subject: [PATCH] Finish settings refactor --- common/lib/xmodule/xmodule/grading_service_module.py | 1 - common/lib/xmodule/xmodule/peer_grading_service.py | 1 + lms/djangoapps/open_ended_grading/controller_query_service.py | 1 + lms/djangoapps/open_ended_grading/staff_grading_service.py | 2 ++ 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/common/lib/xmodule/xmodule/grading_service_module.py b/common/lib/xmodule/xmodule/grading_service_module.py index 9af28a72c5..80325d379e 100644 --- a/common/lib/xmodule/xmodule/grading_service_module.py +++ b/common/lib/xmodule/xmodule/grading_service_module.py @@ -23,7 +23,6 @@ class GradingService(object): self.username = config['username'] self.password = config['password'] self.url = config['url'] - self.login_url = self.url + '/login/' self.session = requests.session() self.system = config['system'] diff --git a/common/lib/xmodule/xmodule/peer_grading_service.py b/common/lib/xmodule/xmodule/peer_grading_service.py index 5efb9eb77f..9535a11b78 100644 --- a/common/lib/xmodule/xmodule/peer_grading_service.py +++ b/common/lib/xmodule/xmodule/peer_grading_service.py @@ -29,6 +29,7 @@ class PeerGradingService(GradingService): config['system'] = system super(PeerGradingService, self).__init__(config) self.url = config['url'] + config['peer_grading'] + self.login_url = self.url + '/login/' self.get_next_submission_url = self.url + '/get_next_submission/' self.save_grade_url = self.url + '/save_grade/' self.is_student_calibrated_url = self.url + '/is_student_calibrated/' diff --git a/lms/djangoapps/open_ended_grading/controller_query_service.py b/lms/djangoapps/open_ended_grading/controller_query_service.py index 03a318b6dc..d7dce71b61 100644 --- a/lms/djangoapps/open_ended_grading/controller_query_service.py +++ b/lms/djangoapps/open_ended_grading/controller_query_service.py @@ -21,6 +21,7 @@ class ControllerQueryService(GradingService): config['system'] = ModuleSystem(None, None, None, render_to_string, None) super(ControllerQueryService, self).__init__(config) self.url = config['url'] + config['grading_controller'] + self.login_url = self.url + '/login/' self.check_eta_url = self.url + '/get_submission_eta/' self.is_unique_url = self.url + '/is_name_unique/' self.combined_notifications_url = self.url + '/combined_notifications/' diff --git a/lms/djangoapps/open_ended_grading/staff_grading_service.py b/lms/djangoapps/open_ended_grading/staff_grading_service.py index 0a760c09f1..c0515c44de 100644 --- a/lms/djangoapps/open_ended_grading/staff_grading_service.py +++ b/lms/djangoapps/open_ended_grading/staff_grading_service.py @@ -64,6 +64,8 @@ class StaffGradingService(GradingService): def __init__(self, config): config['system'] = ModuleSystem(None, None, None, render_to_string, None) super(StaffGradingService, self).__init__(config) + self.url = config['url'] + config['staff_grading'] + self.login_url = self.url + '/login/' self.get_next_url = self.url + '/get_next_submission/' self.save_grade_url = self.url + '/save_grade/' self.get_problem_list_url = self.url + '/get_problem_list/'