diff --git a/lms/djangoapps/grades/models.py b/lms/djangoapps/grades/models.py index d11a6bdb35..f322cef38d 100644 --- a/lms/djangoapps/grades/models.py +++ b/lms/djangoapps/grades/models.py @@ -418,14 +418,27 @@ class PersistentSubsectionGrade(DeleteGradesMixin, TimeStampedModel): grade__course_id=usage_key.course_key, grade__usage_key=usage_key, ) - if override.earned_all_override is not None: - params['earned_all'] = override.earned_all_override - if override.possible_all_override is not None: - params['possible_all'] = override.possible_all_override - if override.earned_graded_override is not None: - params['earned_graded'] = override.earned_graded_override - if override.possible_graded_override is not None: - params['possible_graded'] = override.possible_graded_override + # EDUCTATOR-1127: no-op and log until this behavior is verified in production + # if override.earned_all_override is not None: + # params['earned_all'] = override.earned_all_override + # if override.possible_all_override is not None: + # params['possible_all'] = override.possible_all_override + # if override.earned_graded_override is not None: + # params['earned_graded'] = override.earned_graded_override + # if override.possible_graded_override is not None: + # params['possible_graded'] = override.possible_graded_override + log.info(u"EDUCATOR-1127: Subsection grade for user {user_id} on subsection {usage_key} in course " + u"{course_key} would be overridden with params: {params}".format( + user_id=unicode(user_id), + usage_key=unicode(usage_key), + course_key=unicode(usage_key.course_key), + params=unicode({ + 'earned_all': override.earned_all_override, + 'possible_all': override.possible_all_override, + 'earned_graded': override.earned_graded_override, + 'possible_graded': override.possible_graded_override + })) + ) except PersistentSubsectionGradeOverride.DoesNotExist: pass diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html index aebeb6c63b..ce71201f62 100644 --- a/lms/templates/courseware/progress.html +++ b/lms/templates/courseware/progress.html @@ -183,15 +183,18 @@ from django.utils.http import urlquote_plus %endif

-

+ <%doc> + EDUCATOR-1127: Do not display override notice until override is enabled %if section.override is not None: - %if section.format is not None and section.format == "Exam": - ${_("Exam grade has been overridden due to a failed proctoring review.")} - %else: - ${_("Section grade has been overridden.")} - %endif +

+ %if section.format is not None and section.format == "Exam": + ${_("Exam grade has been overridden due to a failed proctoring review.")} + %else: + ${_("Section grade has been overridden.")} + %endif +

%endif -

+ %if len(section.problem_scores.values()) > 0: %if section.show_grades(staff_access):