Update to version of xblock that supports full inheritance of field attributes
This commit is contained in:
@@ -8,11 +8,13 @@ from pkg_resources import resource_string
|
||||
class_priority = ['video', 'problem']
|
||||
|
||||
|
||||
class VerticalModule(XModule):
|
||||
''' Layout module for laying out submodules vertically.'''
|
||||
|
||||
class VerticalFields(object):
|
||||
has_children = True
|
||||
|
||||
|
||||
class VerticalModule(VerticalFields, XModule):
|
||||
''' Layout module for laying out submodules vertically.'''
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
XModule.__init__(self, *args, **kwargs)
|
||||
self.contents = None
|
||||
@@ -44,11 +46,9 @@ class VerticalModule(XModule):
|
||||
return new_class
|
||||
|
||||
|
||||
class VerticalDescriptor(SequenceDescriptor):
|
||||
class VerticalDescriptor(VerticalFields, SequenceDescriptor):
|
||||
module_class = VerticalModule
|
||||
|
||||
has_children = True
|
||||
|
||||
js = {'coffee': [resource_string(__name__, 'js/src/vertical/edit.coffee')]}
|
||||
js_module_name = "VerticalDescriptor"
|
||||
|
||||
|
||||
@@ -6,4 +6,4 @@
|
||||
# XBlock:
|
||||
# Might change frequently, so put it in local-requirements.txt,
|
||||
# but conceptually is an external package, so it is in a separate repo.
|
||||
-e git+ssh://git@github.com/MITx/xmodule-debugger@5026e686#egg=XBlock
|
||||
-e git+ssh://git@github.com/MITx/xmodule-debugger@9a4f883a#egg=XBlock
|
||||
|
||||
Reference in New Issue
Block a user