?

lms/djangoapps/grades/course_grade.py

@@ -19,13 +19,19 @@ class CourseGradeBase(object):
     """
     Base class for Course Grades.
     """
-    def __init__(self, user, course_data, percent=0.0, letter_grade=None, passed=False, force_update_subsections=False):
+    def __init__(self, user, course_data,
+                 percent=0.0, letter_grade=None,
+                 passed=False, force_update_subsections=False,
+                 enrollment_track_changed=False
+                 ):
         self.user = user
         self.course_data = course_data
 
         self.percent = percent
         self.passed = passed
 
+        self.enrollment_track_changed = enrollment_track_changed
+
         # Convert empty strings to None when reading from the table
         self.letter_grade = letter_grade or None
         self.force_update_subsections = force_update_subsections
@@ -213,7 +219,7 @@ class CourseGradeBase(object):
         """
         Returns a list of subsection grades for the given chapter.
         """
-        enrollment_track_changed = False if self.enrollment_track_changed is None else self.enrollment_track_changed
+        enrollment_track_changed = bool(self.enrollment_track_changed)
         return [
             self._get_subsection_grade(course_structure[subsection_key], enrollment_track_changed)
             for subsection_key in _uniqueify_and_keep_order(course_structure.get_children(chapter_key))

lms/djangoapps/grades/subsection_grade_factory.py

@@ -92,7 +92,8 @@ class SubsectionGradeFactory(object):
             grade_model = calculated_grade.update_or_create_model(
                 self.student,
                 score_deleted,
-                enrollment_track_changed)
+                enrollment_track_changed
+            )
             self._update_saved_subsection_grade(subsection.location, grade_model)
 
         return calculated_grade