Commit 13509170 by E. Kolpakov Committed by Jonathan Piacenti

Fixed broken bok_choy tests + added API key for bok_choy environment setup

parent 091db262
...@@ -1404,8 +1404,9 @@ class DescriptorSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): # p ...@@ -1404,8 +1404,9 @@ class DescriptorSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): # p
return result return result
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
...@@ -1417,8 +1418,9 @@ class DescriptorSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): # p ...@@ -1417,8 +1418,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
...@@ -1446,8 +1448,9 @@ class DescriptorSystem(MetricsMixin, ConfigurableFragmentWrapper, Runtime): # p ...@@ -1446,8 +1448,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")
......
...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment