Merge pull request #5474 from edx/openedx-jira-reference
Reformat seq_module.py
This commit is contained in:
@@ -49,28 +49,31 @@ class SequenceFields(object):
|
||||
class SequenceModule(SequenceFields, XModule):
|
||||
''' Layout module which lays out content in a temporal sequence
|
||||
'''
|
||||
js = {'coffee': [resource_string(__name__,
|
||||
'js/src/sequence/display.coffee')],
|
||||
'js': [resource_string(__name__, 'js/src/sequence/display/jquery.sequence.js')]}
|
||||
css = {'scss': [resource_string(__name__, 'css/sequence/display.scss')]}
|
||||
js = {
|
||||
'coffee': [resource_string(__name__, 'js/src/sequence/display.coffee')],
|
||||
'js': [resource_string(__name__, 'js/src/sequence/display/jquery.sequence.js')],
|
||||
}
|
||||
css = {
|
||||
'scss': [resource_string(__name__, 'css/sequence/display.scss')],
|
||||
}
|
||||
js_module_name = "Sequence"
|
||||
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(SequenceModule, self).__init__(*args, **kwargs)
|
||||
|
||||
# If position is specified in system, then use that instead
|
||||
# This code was made robust to avoid issues like LMS-2799 in
|
||||
# Jira. We do not know whether this issue is still present,
|
||||
# but regardless, we'd like to follow:
|
||||
# http://en.wikipedia.org/wiki/Robustness_principle
|
||||
|
||||
# If position is specified in system, then use that instead.
|
||||
position = getattr(self.system, 'position', None)
|
||||
if position is not None:
|
||||
try:
|
||||
self.position = int(self.system.position)
|
||||
except (ValueError, TypeError):
|
||||
warnings.warn("Sequential position is an invalid type.", RuntimeWarning)
|
||||
# Check for https://openedx.atlassian.net/browse/LMS-6496
|
||||
warnings.warn(
|
||||
"Sequential position cannot be converted to an integer: {pos!r}".format(
|
||||
pos=self.system.position,
|
||||
),
|
||||
RuntimeWarning,
|
||||
)
|
||||
|
||||
def get_progress(self):
|
||||
''' Return the total progress, adding total done and total available.
|
||||
@@ -145,7 +148,9 @@ class SequenceDescriptor(SequenceFields, MakoModuleDescriptor, XmlDescriptor):
|
||||
mako_template = 'widgets/sequence-edit.html'
|
||||
module_class = SequenceModule
|
||||
|
||||
js = {'coffee': [resource_string(__name__, 'js/src/sequence/edit.coffee')]}
|
||||
js = {
|
||||
'coffee': [resource_string(__name__, 'js/src/sequence/edit.coffee')],
|
||||
}
|
||||
js_module_name = "SequenceDescriptor"
|
||||
|
||||
@classmethod
|
||||
|
||||
Reference in New Issue
Block a user