Merge pull request #691 from edx/fix/adam/progress-page

in grading, if problem cannot be created, return score as none

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'])

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