Commit a9c5a638 by Calen Pennington

Update to version of xblock that supports full inheritance of field attributes

parent 1d1a2c8d
...@@ -8,11 +8,13 @@ from pkg_resources import resource_string ...@@ -8,11 +8,13 @@ from pkg_resources import resource_string
class_priority = ['video', 'problem'] class_priority = ['video', 'problem']
class VerticalModule(XModule): class VerticalFields(object):
''' Layout module for laying out submodules vertically.'''
has_children = True has_children = True
class VerticalModule(VerticalFields, XModule):
''' Layout module for laying out submodules vertically.'''
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
XModule.__init__(self, *args, **kwargs) XModule.__init__(self, *args, **kwargs)
self.contents = None self.contents = None
...@@ -44,11 +46,9 @@ class VerticalModule(XModule): ...@@ -44,11 +46,9 @@ class VerticalModule(XModule):
return new_class return new_class
class VerticalDescriptor(SequenceDescriptor): class VerticalDescriptor(VerticalFields, SequenceDescriptor):
module_class = VerticalModule module_class = VerticalModule
has_children = True
js = {'coffee': [resource_string(__name__, 'js/src/vertical/edit.coffee')]} js = {'coffee': [resource_string(__name__, 'js/src/vertical/edit.coffee')]}
js_module_name = "VerticalDescriptor" js_module_name = "VerticalDescriptor"
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# XBlock: # XBlock:
# Might change frequently, so put it in local-requirements.txt, # Might change frequently, so put it in local-requirements.txt,
# but conceptually is an external package, so it is in a separate repo. # 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
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