From 8aee2251361639b71291ba0ae28dcf4e843c9028 Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Thu, 15 Aug 2013 10:35:29 -0400 Subject: [PATCH] in grading, if problem cannot be created, return score as none --- lms/djangoapps/courseware/grades.py | 2 ++ lms/envs/dev.py | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/djangoapps/courseware/grades.py b/lms/djangoapps/courseware/grades.py index e3c40079c3..8874a5686c 100644 --- a/lms/djangoapps/courseware/grades.py +++ b/lms/djangoapps/courseware/grades.py @@ -358,6 +358,8 @@ def get_score(course_id, user, problem_descriptor, module_creator, model_data_ca # with the LMS, so they need to always be scored. (E.g. foldit.) if problem_descriptor.always_recalculate_grades: problem = module_creator(problem_descriptor) + if problem is None: + return (None, None) score = problem.get_score() if score is not None: return (score['score'], score['total']) diff --git a/lms/envs/dev.py b/lms/envs/dev.py index b9768554b1..d47c7bf82d 100644 --- a/lms/envs/dev.py +++ b/lms/envs/dev.py @@ -31,8 +31,6 @@ MITX_FEATURES['ENABLE_SERVICE_STATUS'] = True MITX_FEATURES['ENABLE_HINTER_INSTRUCTOR_VIEW'] = True MITX_FEATURES['ENABLE_INSTRUCTOR_BETA_DASHBOARD'] = True -FEEDBACK_SUBMISSION_EMAIL = "dummy@dummy.org" - FEEDBACK_SUBMISSION_EMAIL = "dummy@example.com" WIKI_ENABLED = True