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
283e5c7b
Commit
283e5c7b
authored
Feb 12, 2013
by
Alexander Kryklia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added passed atrr for smart reloading of content
parent
4b612bd5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
common/lib/xmodule/xmodule/conditional_module.py
+3
-3
lms/templates/conditional_module.html
+2
-0
No files found.
common/lib/xmodule/xmodule/conditional_module.py
View file @
283e5c7b
...
...
@@ -30,7 +30,7 @@ class ConditionalModule(XModule):
TODO string comparison
multiple answer for every poll
"""
"""
π
js
=
{
'coffee'
:
[
resource_string
(
__name__
,
'js/src/javascript_loader.coffee'
),
resource_string
(
__name__
,
'js/src/conditional/display.coffee'
),
...
...
@@ -96,7 +96,7 @@ class ConditionalModule(XModule):
'message'
:
self
.
descriptor
.
xml_attributes
.
get
(
'message'
)}
html
=
self
.
system
.
render_template
(
'conditional_module.html'
,
context
)
return
json
.
dumps
({
'html'
:
[
html
]})
return
json
.
dumps
({
'html'
:
[
html
]
,
'passed'
:
False
})
if
self
.
contents
is
None
:
self
.
contents
=
[
self
.
system
.
get_module
(
child_descriptor
.
location
...
...
@@ -104,7 +104,7 @@ class ConditionalModule(XModule):
for
child_descriptor
in
self
.
descriptor
.
get_children
()]
html
=
self
.
contents
return
json
.
dumps
({
'html'
:
html
})
return
json
.
dumps
({
'html'
:
html
,
'passed'
:
True
})
class
ConditionalDescriptor
(
SequenceDescriptor
):
...
...
lms/templates/conditional_module.html
View file @
283e5c7b
...
...
@@ -12,8 +12,10 @@ def _message(reqm, message):
location=
reqm.location.url())),
url_name =
reqm.display_name))
%
>
<div
data-passed=
"false"
>
% if message:
% for reqm in module.required_modules:
<p>
${_message(reqm, message)}
</p>
% endfor
% endif
</div>
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