Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
a9c5a638
Commit
a9c5a638
authored
Mar 13, 2013
by
Calen Pennington
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update to version of xblock that supports full inheritance of field attributes
parent
1d1a2c8d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
common/lib/xmodule/xmodule/vertical_module.py
+6
-6
local-requirements.txt
+1
-1
No files found.
common/lib/xmodule/xmodule/vertical_module.py
View file @
a9c5a638
...
...
@@ -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"
...
...
local-requirements.txt
View file @
a9c5a638
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment