fix empty display_name problem

This commit is contained in:
Vasyl Nakvasiuk
2013-02-25 18:38:47 +02:00
parent aa34c9d335
commit 2348ed3db1

View File

@@ -17,6 +17,7 @@ log = logging.getLogger(__name__)
# OBSOLETE: This obsoletes 'type'
class_priority = ['video', 'problem']
def display_name(module):
if hasattr(module, 'display_name'):
return module.display_name
@@ -24,6 +25,7 @@ def display_name(module):
if hasattr(module, 'lms'):
return module.lms.display_name
class SequenceModule(XModule):
''' Layout module which lays out content in a temporal sequence
'''
@@ -84,14 +86,14 @@ class SequenceModule(XModule):
'title': "\n".join(
display_name(grand_child)
for grand_child in child.get_children()
if display_name(grand_child) is not None
if display_name(grand_child)
),
'progress_status': Progress.to_js_status_str(progress),
'progress_detail': Progress.to_js_detail_str(progress),
'type': child.get_icon_class(),
'id': child.id,
}
if childinfo['title']=='':
if childinfo['title'] == '':
childinfo['title'] = display_name(child)
contents.append(childinfo)