Commit eb3c5774 by John Hess

Merge branch 'master' of github.com:MITx/mitx into simple-survey

parents 5c48b40f add05059
......@@ -17,8 +17,8 @@ def try_staticfiles_lookup(path):
except Exception as err:
log.warning("staticfiles_storage couldn't find path {}: {}".format(
path, str(err)))
# Just return a dead link--don't kill everything.
url = "file_not_found"
# Just return the original path; don't kill everything.
url = path
return url
......
......@@ -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]
......
......@@ -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):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment