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
e9dacfae
Commit
e9dacfae
authored
Feb 28, 2013
by
Vasyl Nakvasiuk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove `self.contents` from `ConditionalModule`
parent
9186e617
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
9 deletions
+1
-9
common/lib/xmodule/xmodule/conditional_module.py
+1
-9
No files found.
common/lib/xmodule/xmodule/conditional_module.py
View file @
e9dacfae
...
...
@@ -59,10 +59,6 @@ class ConditionalModule(XModule):
'voted'
:
'voted'
# poll_question attr
}
def
__init__
(
self
,
*
args
,
**
kwargs
):
XModule
.
__init__
(
self
,
*
args
,
**
kwargs
)
self
.
contents
=
None
def
_get_condition
(
self
):
# Get first valid condition.
for
xml_attr
,
attr_name
in
self
.
conditions_map
.
iteritems
():
...
...
@@ -119,11 +115,7 @@ class ConditionalModule(XModule):
context
)
return
json
.
dumps
({
'html'
:
[
html
],
'message'
:
bool
(
message
)})
if
self
.
contents
is
None
:
self
.
contents
=
[
child
.
get_html
()
for
child
in
self
.
get_display_items
()]
html
=
self
.
contents
html
=
[
child
.
get_html
()
for
child
in
self
.
get_display_items
()]
return
json
.
dumps
({
'html'
:
html
})
...
...
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