Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Make the markdown attribute default to None, to distinguish it from the empty string

Browse Source
This commit is contained in:
Calen Pennington
2013-03-12 10:50:14 -04:00
parent 1411fadd28
commit f6b4d3aa46
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/djangoapps/contentstore/views.py
View File

@@ -325,7 +325,7 @@ def edit_unit(request, location):
component_templates[category].append((
template.display_name_with_default,
template.location.url(),
hasattr(template, 'markdown') and template.markdown != '',
hasattr(template, 'markdown') and template.markdown is not None,
template.cms.empty,
))

4
common/lib/xmodule/xmodule/capa_module.py
View File

@@ -801,7 +801,7 @@ class CapaDescriptor(RawDescriptor):
module_class = CapaModule
weight = StringyFloat(help="How much to weight this problem by", scope=Scope.settings)
markdown = String(help="Markdown source of this module", scope=Scope.settings, default='')
markdown = String(help="Markdown source of this module", scope=Scope.settings)
stores_state = True
has_score = True
@@ -824,7 +824,7 @@ class CapaDescriptor(RawDescriptor):
def get_context(self):
_context = RawDescriptor.get_context(self)
_context.update({'markdown': self.markdown,
'enable_markdown' : self.markdown != ''})
'enable_markdown': self.markdown is not None})
return _context
@property