Commit 691744e3 by Victor Shnayder

Use .display_name instead of metadata['display_name']

* the former does a fallback if metadata['display_name'] isn't set.
parent 5e2f6761
...@@ -237,7 +237,7 @@ class CapaModule(XModule): ...@@ -237,7 +237,7 @@ class CapaModule(XModule):
else: else:
raise raise
content = {'name': self.metadata['display_name'], content = {'name': self.display_name,
'html': html, 'html': html,
'weight': self.weight, 'weight': self.weight,
} }
......
...@@ -140,7 +140,7 @@ class CourseDescriptor(SequenceDescriptor): ...@@ -140,7 +140,7 @@ class CourseDescriptor(SequenceDescriptor):
@property @property
def title(self): def title(self):
return self.metadata['display_name'] return self.display_name
@property @property
def number(self): def number(self):
......
...@@ -76,7 +76,7 @@ class SequenceModule(XModule): ...@@ -76,7 +76,7 @@ class SequenceModule(XModule):
contents.append({ contents.append({
'content': child.get_html(), 'content': child.get_html(),
'title': "\n".join( 'title': "\n".join(
grand_child.metadata['display_name'].strip() grand_child.display_name.strip()
for grand_child in child.get_children() for grand_child in child.get_children()
if 'display_name' in grand_child.metadata if 'display_name' in grand_child.metadata
), ),
......
...@@ -77,7 +77,7 @@ def manage_modulestores(request,reload_dir=None): ...@@ -77,7 +77,7 @@ def manage_modulestores(request,reload_dir=None):
for cdir, course in def_ms.courses.items(): for cdir, course in def_ms.courses.items():
html += '<hr width="100%"/>' html += '<hr width="100%"/>'
html += '<h2>Course: %s (%s)</h2>' % (course.metadata['display_name'],cdir) html += '<h2>Course: %s (%s)</h2>' % (course.display_name,cdir)
for field in dumpfields: for field in dumpfields:
data = getattr(course,field) data = getattr(course,field)
......
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