Address comments on #394

common/lib/xmodule/xmodule/x_module.py

@@ -227,7 +227,7 @@ class XModule(HTMLSnippet):
     def get_display_items(self):
         '''
         Returns a list of descendent module instances that will display
-        immediately inside this module
+        immediately inside this module.
         '''
         items = []
         for child in self.get_children():
@@ -238,7 +238,7 @@ class XModule(HTMLSnippet):
     def displayable_items(self):
         '''
         Returns list of displayable modules contained by this module. If this
-        module is visible, should return [self]
+        module is visible, should return [self].
         '''
         return [self]
 

lms/djangoapps/courseware/grades.py

@@ -145,15 +145,11 @@ def progress_summary(student, course, grader, student_module_cache):
              instance_modules for the student
     """
     chapters = []
-    for c in course.get_children():
-        # Don't include chapters that aren't displayable (e.g. due to error)
-        if c not in c.displayable_items():
-            continue
+    # Don't include chapters that aren't displayable (e.g. due to error)
+    for c in course.get_display_items():
         sections = []
-        for s in c.get_children():
+        for s in c.get_display_items():
             # Same for sections
-            if s not in s.displayable_items():
-                continue
             graded = s.metadata.get('graded', False)
             scores = []
             for module in yield_module_descendents(s):