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

fix typo, add comment

Browse Source
This commit is contained in:
Victor Shnayder
2013-02-04 15:04:20 -05:00
parent 6088a926cc
commit fe42d8e9a8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -414,12 +414,14 @@ class CapaModule(XModule):
elif self.show_answer == "never": elif self.show_answer == "never":
return False return False
elif self.system.user_is_staff: elif self.system.user_is_staff:
# This i after the 'never' check because admins can see the answer # This is after the 'never' check because admins can see the answer
# unless the problem explicitly prevents it # unless the problem explicitly prevents it
return True return True
elif self.show_answer == 'attempted': elif self.show_answer == 'attempted':
return self.attempts > 0 return self.attempts > 0
elif self.show_answer == 'answered': elif self.show_answer == 'answered':
# NOTE: this is slightly different from 'attempted' -- resetting the problems
# makes lcp.done False, but leaves attempts unchanged.
return self.lcp.done return self.lcp.done
elif self.show_answer == 'closed': elif self.show_answer == 'closed':
return self.closed() return self.closed()
@@ -674,18 +676,18 @@ class CapaDescriptor(RawDescriptor):
# TODO (vshnayder): do problems have any other metadata? Do they # TODO (vshnayder): do problems have any other metadata? Do they
# actually use type and points? # actually use type and points?
metadata_attributes = RawDescriptor.metadata_attributes + ('type', 'points') metadata_attributes = RawDescriptor.metadata_attributes + ('type', 'points')
def get_context(self): def get_context(self):
_context = RawDescriptor.get_context(self) _context = RawDescriptor.get_context(self)
_context.update({'markdown': self.metadata.get('markdown', '')}) _context.update({'markdown': self.metadata.get('markdown', '')})
return _context return _context
@property @property
def editable_metadata_fields(self): def editable_metadata_fields(self):
"""Remove metadata from the editable fields since it has its own editor""" """Remove metadata from the editable fields since it has its own editor"""
subset = super(CapaDescriptor,self).editable_metadata_fields subset = super(CapaDescriptor,self).editable_metadata_fields
if 'markdown' in subset: if 'markdown' in subset:
subset.remove('markdown') subset.remove('markdown')
return subset return subset