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
c16f6888
Commit
c16f6888
authored
Feb 06, 2013
by
ichuang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conditional xmod: add errortracker msg and inherit icon from child
parent
6b468df5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletions
+12
-1
common/lib/xmodule/xmodule/conditional_module.py
+12
-1
No files found.
common/lib/xmodule/xmodule/conditional_module.py
View file @
c16f6888
...
...
@@ -44,6 +44,10 @@ class ConditionalModule(XModule):
XModule
.
__init__
(
self
,
system
,
location
,
definition
,
descriptor
,
instance_state
,
shared_state
,
**
kwargs
)
self
.
contents
=
None
self
.
condition
=
self
.
metadata
.
get
(
'condition'
,
''
)
self
.
_get_required_modules
()
children
=
self
.
get_display_items
()
if
children
:
self
.
icon_class
=
children
[
0
]
.
get_icon_class
()
#log.debug('conditional module required=%s' % self.required_modules_list)
def
_get_required_modules
(
self
):
...
...
@@ -127,7 +131,14 @@ class ConditionalDescriptor(SequenceDescriptor):
required_module_list
=
[
tuple
(
x
.
split
(
'/'
,
1
))
for
x
in
self
.
metadata
.
get
(
'required'
,
''
)
.
split
(
'&'
)]
self
.
required_module_locations
=
[]
for
(
tag
,
name
)
in
required_module_list
:
for
rm
in
required_module_list
:
try
:
(
tag
,
name
)
=
rm
except
Exception
as
err
:
msg
=
"Specification of required module in conditional is broken:
%
s"
%
self
.
metadata
.
get
(
'required'
)
log
.
warning
(
msg
)
self
.
system
.
error_tracker
(
msg
)
continue
loc
=
self
.
location
.
dict
()
loc
[
'category'
]
=
tag
loc
[
'name'
]
=
name
...
...
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