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
fc6e690f
Commit
fc6e690f
authored
Nov 10, 2014
by
E. Kolpakov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed broken bok_choy tests + added API key for bok_choy environment setup
parent
0dae90ae
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
common/lib/xmodule/xmodule/x_module.py
+9
-6
lms/envs/bok_choy.env.json
+1
-1
No files found.
common/lib/xmodule/xmodule/x_module.py
View file @
fc6e690f
...
@@ -1187,8 +1187,9 @@ class DescriptorSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): # p
...
@@ -1187,8 +1187,9 @@ class DescriptorSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): # p
return
super
(
DescriptorSystem
,
self
)
.
render
(
block
,
view_name
,
context
)
return
super
(
DescriptorSystem
,
self
)
.
render
(
block
,
view_name
,
context
)
def
handler_url
(
self
,
block
,
handler_name
,
suffix
=
''
,
query
=
''
,
thirdparty
=
False
):
def
handler_url
(
self
,
block
,
handler_name
,
suffix
=
''
,
query
=
''
,
thirdparty
=
False
):
if
block
.
xmodule_runtime
is
not
None
:
xmodule_runtime
=
getattr
(
block
,
'xmodule_runtime'
,
None
)
return
block
.
xmodule_runtime
.
handler_url
(
block
,
handler_name
,
suffix
,
query
,
thirdparty
)
if
xmodule_runtime
is
not
None
:
return
xmodule_runtime
.
handler_url
(
block
,
handler_name
,
suffix
,
query
,
thirdparty
)
else
:
else
:
# Currently, Modulestore is responsible for instantiating DescriptorSystems
# Currently, Modulestore is responsible for instantiating DescriptorSystems
# This means that LMS/CMS don't have a way to define a subclass of DescriptorSystem
# This means that LMS/CMS don't have a way to define a subclass of DescriptorSystem
...
@@ -1200,8 +1201,9 @@ class DescriptorSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): # p
...
@@ -1200,8 +1201,9 @@ class DescriptorSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): # p
"""
"""
See :meth:`xblock.runtime.Runtime:local_resource_url` for documentation.
See :meth:`xblock.runtime.Runtime:local_resource_url` for documentation.
"""
"""
if
block
.
xmodule_runtime
is
not
None
:
xmodule_runtime
=
getattr
(
block
,
'xmodule_runtime'
,
None
)
return
block
.
xmodule_runtime
.
local_resource_url
(
block
,
uri
)
if
xmodule_runtime
is
not
None
:
return
xmodule_runtime
.
local_resource_url
(
block
,
uri
)
else
:
else
:
# Currently, Modulestore is responsible for instantiating DescriptorSystems
# Currently, Modulestore is responsible for instantiating DescriptorSystems
# This means that LMS/CMS don't have a way to define a subclass of DescriptorSystem
# This means that LMS/CMS don't have a way to define a subclass of DescriptorSystem
...
@@ -1219,8 +1221,9 @@ class DescriptorSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): # p
...
@@ -1219,8 +1221,9 @@ class DescriptorSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): # p
"""
"""
See :meth:`xblock.runtime.Runtime:publish` for documentation.
See :meth:`xblock.runtime.Runtime:publish` for documentation.
"""
"""
if
block
.
xmodule_runtime
is
not
None
:
xmodule_runtime
=
getattr
(
block
,
'xmodule_runtime'
,
None
)
return
block
.
xmodule_runtime
.
publish
(
block
,
event_type
,
event
)
if
xmodule_runtime
is
not
None
:
return
xmodule_runtime
.
publish
(
block
,
event_type
,
event
)
def
add_block_as_child_node
(
self
,
block
,
node
):
def
add_block_as_child_node
(
self
,
block
,
node
):
child
=
etree
.
SubElement
(
node
,
"unknown"
)
child
=
etree
.
SubElement
(
node
,
"unknown"
)
...
...
lms/envs/bok_choy.env.json
View file @
fc6e690f
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
"DEFAULT_FROM_EMAIL"
:
"registration@example.com"
,
"DEFAULT_FROM_EMAIL"
:
"registration@example.com"
,
"EMAIL_BACKEND"
:
"django.core.mail.backends.smtp.EmailBackend"
,
"EMAIL_BACKEND"
:
"django.core.mail.backends.smtp.EmailBackend"
,
"FEATURES"
:
{
"FEATURES"
:
{
"API"
:
"true"
,
"API"
:
true
,
"ORGANIZATIONS_APP"
:
true
,
"ORGANIZATIONS_APP"
:
true
,
"AUTH_USE_OPENID_PROVIDER"
:
true
,
"AUTH_USE_OPENID_PROVIDER"
:
true
,
"CERTIFICATES_ENABLED"
:
true
,
"CERTIFICATES_ENABLED"
:
true
,
...
...
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