{msg}
').format(msg=msg) - msg += HTML(u'{tb}').format(
- # just the traceback, no message - it is already present above
- tb=u''.join(
- ['Traceback (most recent call last):\n'] +
- traceback.format_tb(sys.exc_info()[2])
- )
- )
- # create a dummy problem with error message instead of failing
- problem_text = (
- HTML(u'{html}
').format(
- id=self.location.html_id(), ajax_url=self.runtime.ajax_url, html=HTML(html)
+ id=self.location.html_id(), ajax_url=self.ajax_url, html=HTML(html)
)
# Now do all the substitutions which the LMS module_render normally does, but
@@ -958,7 +955,7 @@ class CapaMixin(ScorableXBlockMixin, CapaFields):
score_msg = data['xqueue_body']
self.lcp.update_score(score_msg, queuekey)
self.set_state_from_lcp()
- self.set_score(self.score_from_lcp())
+ self.set_score(self.score_from_lcp(self.lcp))
self.publish_grade(grader_response=True)
return dict() # No AJAX return is needed
@@ -1228,7 +1225,7 @@ class CapaMixin(ScorableXBlockMixin, CapaFields):
self.attempts = self.attempts + 1
self.lcp.done = True
self.set_state_from_lcp()
- self.set_score(self.score_from_lcp())
+ self.set_score(self.score_from_lcp(self.lcp))
self.set_last_submission_time()
except (StudentInputError, ResponseError, LoncapaProblemError) as inst:
@@ -1240,7 +1237,7 @@ class CapaMixin(ScorableXBlockMixin, CapaFields):
# Save the user's state before failing
self.set_state_from_lcp()
- self.set_score(self.score_from_lcp())
+ self.set_score(self.score_from_lcp(self.lcp))
# If the user is a staff member, include
# the full exception, including traceback,
@@ -1263,7 +1260,7 @@ class CapaMixin(ScorableXBlockMixin, CapaFields):
except Exception as err:
# Save the user's state before failing
self.set_state_from_lcp()
- self.set_score(self.score_from_lcp())
+ self.set_score(self.score_from_lcp(self.lcp))
if self.runtime.DEBUG:
msg = u"Error checking problem: {}".format(text_type(err))
@@ -1444,7 +1441,7 @@ class CapaMixin(ScorableXBlockMixin, CapaFields):
# later if necessary.
variant = ''
if self.rerandomize != RANDOMIZATION.NEVER:
- variant = self.seed
+ variant = self.get_seed()
is_correct = correct_map.is_correct(input_id)
if is_correct is None:
@@ -1503,7 +1500,7 @@ class CapaMixin(ScorableXBlockMixin, CapaFields):
self.lcp.has_saved_answers = True
self.set_state_from_lcp()
- self.set_score(self.score_from_lcp())
+ self.set_score(self.score_from_lcp(self.lcp))
self.track_function_unmask('save_problem_success', event_info)
msg = _("Your answers have been saved.")
@@ -1562,7 +1559,7 @@ class CapaMixin(ScorableXBlockMixin, CapaFields):
# Pull in the new problem seed
self.set_state_from_lcp()
- self.set_score(self.score_from_lcp())
+ self.set_score(self.score_from_lcp(self.lcp))
# Grade may have changed, so publish new value
self.publish_grade()
@@ -1687,10 +1684,10 @@ class CapaMixin(ScorableXBlockMixin, CapaFields):
new_score = self.lcp.calculate_score()
return Score(raw_earned=new_score['score'], raw_possible=new_score['total'])
- def score_from_lcp(self):
+ def score_from_lcp(self, lcp):
"""
Returns the score associated with the correctness map
currently stored by the LCP.
"""
- lcp_score = self.lcp.calculate_score()
+ lcp_score = lcp.calculate_score()
return Score(raw_earned=lcp_score['score'], raw_possible=lcp_score['total'])
diff --git a/common/lib/xmodule/xmodule/capa_base_constants.py b/common/lib/xmodule/xmodule/capa_base_constants.py
deleted file mode 100644
index 380ec1885d..0000000000
--- a/common/lib/xmodule/xmodule/capa_base_constants.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Constants for capa_base problems
-"""
-
-
-class SHOWANSWER(object):
- """
- Constants for when to show answer
- """
- ALWAYS = "always"
- ANSWERED = "answered"
- ATTEMPTED = "attempted"
- CLOSED = "closed"
- FINISHED = "finished"
- CORRECT_OR_PAST_DUE = "correct_or_past_due"
- PAST_DUE = "past_due"
- NEVER = "never"
- AFTER_SOME_NUMBER_OF_ATTEMPTS = "after_attempts"
-
-
-class RANDOMIZATION(object):
- """
- Constants for problem randomization
- """
- ALWAYS = "always"
- ONRESET = "onreset"
- NEVER = "never"
- PER_STUDENT = "per_student"
diff --git a/common/lib/xmodule/xmodule/capa_module.py b/common/lib/xmodule/xmodule/capa_module.py
index d11880ca24..5f9e7bf087 100644
--- a/common/lib/xmodule/xmodule/capa_module.py
+++ b/common/lib/xmodule/xmodule/capa_module.py
@@ -6,41 +6,106 @@ import sys
from lxml import etree
from pkg_resources import resource_string
+from web_fragments.fragment import Fragment
+from xblock.core import XBlock
from capa import responsetypes
+from xmodule.editing_module import EditingMixin
from xmodule.exceptions import NotFoundError, ProcessingError
-from xmodule.raw_module import RawDescriptor
+from xmodule.raw_module import RawMixin
from xmodule.contentstore.django import contentstore
from xmodule.util.misc import escape_html_characters
from xmodule.util.sandboxing import get_python_lib_zip
-from xmodule.x_module import DEPRECATION_VSCOMPAT_EVENT, XModule, module_attr
+from xmodule.util.xmodule_django import add_webpack_to_fragment
+from xmodule.x_module import (
+ HTMLSnippet, ResourceTemplates, shim_xmodule_js,
+ XModuleMixin, XModuleToXBlockMixin, XModuleDescriptorToXBlockMixin,
+)
+from xmodule.xml_module import XmlMixin
-from .capa_base import CapaFields, CapaMixin, ComplexEncoder
+from .capa_base import _, CapaMixin, ComplexEncoder
log = logging.getLogger("edx.courseware")
-class CapaModule(CapaMixin, XModule):
+@XBlock.wants('user') # pylint: disable=abstract-method
+@XBlock.needs('i18n')
+class ProblemBlock(
+ CapaMixin, RawMixin, XmlMixin, EditingMixin,
+ XModuleDescriptorToXBlockMixin, XModuleToXBlockMixin, HTMLSnippet, ResourceTemplates, XModuleMixin):
"""
- An XModule implementing LonCapa format problems, implemented by way of
- capa.capa_problem.LoncapaProblem
+ The XBlock for CAPA.
+ """
+ INDEX_CONTENT_TYPE = 'CAPA'
+
+ resources_dir = None
+
+ has_score = True
+ show_in_read_only_mode = True
+ template_dir_name = 'problem'
+ mako_template = "widgets/problem-edit.html"
+ has_author_view = True
+
+ # The capa format specifies that what we call max_attempts in the code
+ # is the attribute `attempts`. This will do that conversion
+ metadata_translations = dict(XmlMixin.metadata_translations)
+ metadata_translations['attempts'] = 'max_attempts'
- CapaModule.__init__ takes the same arguments as xmodule.x_module:XModule.__init__
- """
icon_class = 'problem'
- js = {
+ uses_xmodule_styles_setup = True
+ requires_per_student_anonymous_id = True
+
+ preview_view_js = {
'js': [
resource_string(__name__, 'js/src/javascript_loader.js'),
resource_string(__name__, 'js/src/capa/display.js'),
resource_string(__name__, 'js/src/collapsible.js'),
resource_string(__name__, 'js/src/capa/imageinput.js'),
resource_string(__name__, 'js/src/capa/schematic.js'),
+ ],
+ 'xmodule_js': resource_string(__name__, 'js/src/xmodule.js')
+ }
+
+ preview_view_css = {
+ 'scss': [
+ resource_string(__name__, 'css/capa/display.scss'),
+ ],
+ }
+
+ studio_view_js = {
+ 'js': [
+ resource_string(__name__, 'js/src/problem/edit.js'),
+ ],
+ 'xmodule_js': resource_string(__name__, 'js/src/xmodule.js'),
+ }
+
+ studio_view_css = {
+ 'scss': [
+ resource_string(__name__, 'css/editor/edit.scss'),
+ resource_string(__name__, 'css/problem/edit.scss'),
]
}
- js_module_name = "Problem"
- css = {'scss': [resource_string(__name__, 'css/capa/display.scss')]}
+ def bind_for_student(self, *args, **kwargs):
+ super(ProblemBlock, self).bind_for_student(*args, **kwargs)
+
+ # Capa was an XModule. When bind_for_student() was called on it with a new runtime, a new CapaModule object
+ # was initialized when XModuleDescriptor._xmodule() was called next. self.lcp was constructed in CapaModule
+ # init(). To keep the same behaviour, we delete self.lcp in bind_for_student().
+ if 'lcp' in self.__dict__:
+ del self.__dict__['lcp']
+
+ def student_view(self, _context):
+ """
+ Return the student view.
+ """
+ # self.score is initialized in self.lcp but in this method is accessed before self.lcp so just call it first.
+ self.lcp
+ fragment = Fragment(self.get_html())
+ add_webpack_to_fragment(fragment, 'ProblemBlockPreview')
+ shim_xmodule_js(fragment, 'Problem')
+ return fragment
def author_view(self, context):
"""
@@ -48,6 +113,17 @@ class CapaModule(CapaMixin, XModule):
"""
return self.student_view(context)
+ def studio_view(self, _context):
+ """
+ Return the studio view.
+ """
+ fragment = Fragment(
+ self.system.render_template(self.mako_template, self.get_context())
+ )
+ add_webpack_to_fragment(fragment, 'ProblemBlockStudio')
+ shim_xmodule_js(fragment, 'MarkdownEditingDescriptor')
+ return fragment
+
def handle_ajax(self, dispatch, data):
"""
This is called by courseware.module_render, to handle an AJAX call.
@@ -59,6 +135,8 @@ class CapaModule(CapaMixin, XModule):
'progress' : 'none'/'in_progress'/'done',
Test Template HTML
")
- module = CapaModule(
- descriptor,
+ module = ProblemBlock(
system,
DictFieldData(field_data),
- ScopeIds(None, None, location, location),
+ ScopeIds(None, 'problem', location, location),
)
+ assert module.lcp
if override_get_score:
if correct:
@@ -137,6 +137,7 @@ class CapaFactory(object):
module.score = Score(raw_earned=0, raw_possible=1)
module.graded = 'False'
+ module.weight = 1
return module
@@ -182,10 +183,10 @@ if submission[0] == '':
@ddt.ddt
-class CapaModuleTest(unittest.TestCase):
+class ProblemBlockTest(unittest.TestCase):
def setUp(self):
- super(CapaModuleTest, self).setUp()
+ super(ProblemBlockTest, self).setUp()
now = datetime.datetime.now(UTC)
day_delta = datetime.timedelta(days=1)
@@ -227,7 +228,7 @@ class CapaModuleTest(unittest.TestCase):
module.lcp.correct_map = correct_map
module.lcp.student_answers = student_answers
self.assertEqual(module.get_score().raw_earned, 0.0)
- module.set_score(module.score_from_lcp())
+ module.set_score(module.score_from_lcp(module.lcp))
self.assertEqual(module.get_score().raw_earned, 0.9)
other_correct_map = CorrectMap(answer_id='1_2_1', correctness="incorrect", npoints=0.1)
@@ -235,7 +236,7 @@ class CapaModuleTest(unittest.TestCase):
other_module.lcp.correct_map = other_correct_map
other_module.lcp.student_answers = student_answers
self.assertEqual(other_module.get_score().raw_earned, 0.0)
- other_module.set_score(other_module.score_from_lcp())
+ other_module.set_score(other_module.score_from_lcp(other_module.lcp))
self.assertEqual(other_module.get_score().raw_earned, 0.1)
def test_showanswer_default(self):
@@ -699,7 +700,7 @@ class CapaModuleTest(unittest.TestCase):
'input_6': 5
})
- result = CapaModule.make_dict_of_responses(valid_get_dict)
+ result = ProblemBlock.make_dict_of_responses(valid_get_dict)
# Expect that we get a dict with "input" stripped from key names
# and that we get the same values back
@@ -711,20 +712,20 @@ class CapaModuleTest(unittest.TestCase):
# Valid GET param dict with list keys
# Each tuple represents a single parameter in the query string
valid_get_dict = MultiDict((('input_2[]', 'test1'), ('input_2[]', 'test2')))
- result = CapaModule.make_dict_of_responses(valid_get_dict)
+ result = ProblemBlock.make_dict_of_responses(valid_get_dict)
self.assertIn('2', result)
self.assertEqual(['test1', 'test2'], result['2'])
# If we use [] at the end of a key name, we should always
# get a list, even if there's just one value
valid_get_dict = MultiDict({'input_1[]': 'test'})
- result = CapaModule.make_dict_of_responses(valid_get_dict)
+ result = ProblemBlock.make_dict_of_responses(valid_get_dict)
self.assertEqual(result['1'], ['test'])
# If we have no underscores in the name, then the key is invalid
invalid_get_dict = MultiDict({'input': 'test'})
with self.assertRaises(ValueError):
- result = CapaModule.make_dict_of_responses(invalid_get_dict)
+ result = ProblemBlock.make_dict_of_responses(invalid_get_dict)
# Two equivalent names (one list, one non-list)
# One of the values would overwrite the other, so detect this
@@ -732,7 +733,7 @@ class CapaModuleTest(unittest.TestCase):
invalid_get_dict = MultiDict({'input_1[]': 'test 1',
'input_1': 'test 2'})
with self.assertRaises(ValueError):
- result = CapaModule.make_dict_of_responses(invalid_get_dict)
+ result = ProblemBlock.make_dict_of_responses(invalid_get_dict)
def test_submit_problem_correct(self):
@@ -742,7 +743,7 @@ class CapaModuleTest(unittest.TestCase):
# what the input is, by patching CorrectMap.is_correct()
# Also simulate rendering the HTML
with patch('capa.correctmap.CorrectMap.is_correct') as mock_is_correct:
- with patch('xmodule.capa_module.CapaModule.get_problem_html') as mock_html:
+ with patch('xmodule.capa_module.ProblemBlock.get_problem_html') as mock_html:
mock_is_correct.return_value = True
mock_html.return_value = "Test HTML"
@@ -785,8 +786,8 @@ class CapaModuleTest(unittest.TestCase):
module = CapaFactory.create(attempts=3)
# Problem closed -- cannot submit
- # Simulate that CapaModule.closed() always returns True
- with patch('xmodule.capa_module.CapaModule.closed') as mock_closed:
+ # Simulate that ProblemBlock.closed() always returns True
+ with patch('xmodule.capa_module.ProblemBlock.closed') as mock_closed:
mock_closed.return_value = True
with self.assertRaises(xmodule.exceptions.NotFoundError):
get_request_dict = {CapaFactory.input_key(): '3.14'}
@@ -948,10 +949,7 @@ class CapaModuleTest(unittest.TestCase):
for exception_class in exception_classes:
# Create the module
- module = CapaFactory.create(attempts=1)
-
- # Ensure that the user is NOT staff
- module.system.user_is_staff = False
+ module = CapaFactory.create(attempts=1, user_is_staff=False)
# Simulate answering a problem that raises the exception
with patch('capa.capa_problem.LoncapaProblem.grade_answers') as mock_grade:
@@ -979,10 +977,7 @@ class CapaModuleTest(unittest.TestCase):
for exception_class in exception_classes:
# Create the module
- module = CapaFactory.create(attempts=1)
-
- # Ensure that the user is NOT staff
- module.system.user_is_staff = False
+ module = CapaFactory.create(attempts=1, user_is_staff=False)
# Simulate a codejail exception "Exception: Couldn't execute jailed code"
with patch('capa.capa_problem.LoncapaProblem.grade_answers') as mock_grade:
@@ -1015,10 +1010,7 @@ class CapaModuleTest(unittest.TestCase):
See also `test_submit_problem_error` for the "expected kinds" or errors.
"""
# Create the module
- module = CapaFactory.create(attempts=1)
-
- # Ensure that the user is NOT staff
- module.system.user_is_staff = False
+ module = CapaFactory.create(attempts=1, user_is_staff=False)
# Ensure that DEBUG is on
module.system.DEBUG = True
@@ -1057,10 +1049,7 @@ class CapaModuleTest(unittest.TestCase):
for exception_class in exception_classes:
# Create the module
- module = CapaFactory.create(attempts=1)
-
- # Ensure that the user is NOT staff
- module.system.user_is_staff = False
+ module = CapaFactory.create(attempts=1, user_is_staff=False)
# Simulate answering a problem that raises the exception
with patch('capa.capa_problem.LoncapaProblem.grade_answers') as mock_grade:
@@ -1087,10 +1076,7 @@ class CapaModuleTest(unittest.TestCase):
ResponseError]:
# Create the module
- module = CapaFactory.create(attempts=1)
-
- # Ensure that the user IS staff
- module.system.user_is_staff = True
+ module = CapaFactory.create(attempts=1, user_is_staff=True)
# Simulate answering a problem that raises an exception
with patch('capa.capa_problem.LoncapaProblem.grade_answers') as mock_grade:
@@ -1147,7 +1133,7 @@ class CapaModuleTest(unittest.TestCase):
module.choose_new_seed = Mock(wraps=module.choose_new_seed)
# Stub out HTML rendering
- with patch('xmodule.capa_module.CapaModule.get_problem_html') as mock_html:
+ with patch('xmodule.capa_module.ProblemBlock.get_problem_html') as mock_html:
mock_html.return_value = "Test HTML
"
# Reset the problem
@@ -1169,7 +1155,7 @@ class CapaModuleTest(unittest.TestCase):
module = CapaFactory.create(rerandomize=RANDOMIZATION.ALWAYS)
# Simulate that the problem is closed
- with patch('xmodule.capa_module.CapaModule.closed') as mock_closed:
+ with patch('xmodule.capa_module.ProblemBlock.closed') as mock_closed:
mock_closed.return_value = True
# Try to reset the problem
@@ -1244,7 +1230,7 @@ class CapaModuleTest(unittest.TestCase):
with patch('capa.correctmap.CorrectMap.is_correct') as mock_is_correct:
mock_is_correct.return_value = True
- module.set_score(module.score_from_lcp())
+ module.set_score(module.score_from_lcp(module.lcp))
with patch('capa.responsetypes.NumericalResponse.get_staff_ans') as get_staff_ans:
get_staff_ans.return_value = 1 + 0j
module.rescore(only_if_higher=True)
@@ -1336,7 +1322,7 @@ class CapaModuleTest(unittest.TestCase):
module = CapaFactory.create(done=False)
# Simulate that the problem is closed
- with patch('xmodule.capa_module.CapaModule.closed') as mock_closed:
+ with patch('xmodule.capa_module.ProblemBlock.closed') as mock_closed:
mock_closed.return_value = True
# Try to save the problem
@@ -2135,7 +2121,7 @@ class CapaModuleTest(unittest.TestCase):
@ddt.ddt
-class CapaDescriptorTest(unittest.TestCase):
+class ProblemBlockXMLTest(unittest.TestCase):
sample_checkbox_problem_xml = textwrap.dedent("""
Test Template HTML
")
- module = CapaModule(
- descriptor,
+ module = ProblemBlock(
system,
DictFieldData(field_data),
ScopeIds(None, None, location, location),
diff --git a/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py b/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py
index 9c1a375967..4e2e004b1b 100644
--- a/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py
+++ b/common/lib/xmodule/xmodule/tests/test_xblock_wrappers.py
@@ -30,7 +30,6 @@ from opaque_keys.edx.locator import BlockUsageLocator, CourseLocator
from xmodule.x_module import ModuleSystem, XModule, XModuleDescriptor, DescriptorSystem, STUDENT_VIEW, STUDIO_VIEW, PUBLIC_VIEW
from xmodule.annotatable_module import AnnotatableDescriptor
-from xmodule.capa_module import CapaDescriptor
from xmodule.course_module import CourseDescriptor
from xmodule.html_module import HtmlDescriptor
from xmodule.poll_module import PollDescriptor
@@ -49,7 +48,6 @@ from xmodule.tests import get_test_descriptor_system, get_test_system
# TODO: Add more types of sample data
LEAF_XMODULES = {
AnnotatableDescriptor: [{}],
- CapaDescriptor: [{}],
HtmlDescriptor: [{}],
PollDescriptor: [{'display_name': 'Poll Display Name'}],
WordCloudDescriptor: [{}],
diff --git a/common/lib/xmodule/xmodule/video_module/video_module.py b/common/lib/xmodule/xmodule/video_module/video_module.py
index a02231318d..ad8a7533c4 100644
--- a/common/lib/xmodule/xmodule/video_module/video_module.py
+++ b/common/lib/xmodule/xmodule/video_module/video_module.py
@@ -225,6 +225,7 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
branding_info = None
youtube_streams = ""
video_duration = None
+ video_status = None
# Determine if there is an alternative source for this video
# based on user locale. This exists to support cases where
@@ -271,6 +272,7 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
# get video duration
video_data = edxval_api.get_video_info(self.edx_video_id.strip())
video_duration = video_data.get('duration')
+ video_status = video_data.get('status')
except (edxval_api.ValInternalError, edxval_api.ValVideoNotFoundError):
# VAL raises this exception if it can't find data for the edx video ID. This can happen if the
@@ -285,7 +287,7 @@ class VideoModule(VideoFields, VideoTranscriptsMixin, VideoStudentViewHandlers,
if getattr(self, 'video_speed_optimizations', True) and cdn_url:
branding_info = BrandingInfoConfig.get_config().get(self.system.user_location)
- if self.edx_video_id and edxval_api:
+ if self.edx_video_id and edxval_api and video_status != u'external':
for index, source_url in enumerate(sources):
new_url = rewrite_video_url(cdn_url, source_url)
if new_url:
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 521d2fd445..2760bc83f1 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -207,7 +207,12 @@ class HTMLSnippet(object):
js = {}
js_module_name = None
+ preview_view_js = {}
+ studio_view_js = {}
+
css = {}
+ preview_view_css = {}
+ studio_view_css = {}
@classmethod
def get_javascript(cls):
@@ -233,6 +238,30 @@ class HTMLSnippet(object):
return cls.js
+ @classmethod
+ def get_preview_view_js(cls):
+ if issubclass(cls, XModule):
+ return cls.get_javascript()
+ return cls.preview_view_js
+
+ @classmethod
+ def get_preview_view_js_bundle_name(cls):
+ if issubclass(cls, XModule):
+ return cls.__name__
+ return cls.__name__ + 'Preview'
+
+ @classmethod
+ def get_studio_view_js(cls):
+ if issubclass(cls, XModuleDescriptor):
+ return cls.get_javascript()
+ return cls.studio_view_js
+
+ @classmethod
+ def get_studio_view_js_bundle_name(cls):
+ if issubclass(cls, XModuleDescriptor):
+ return cls.__name__
+ return cls.__name__ + 'Studio'
+
@classmethod
def get_css(cls):
"""
@@ -249,6 +278,18 @@ class HTMLSnippet(object):
"""
return cls.css
+ @classmethod
+ def get_preview_view_css(cls):
+ if issubclass(cls, XModule):
+ return cls.get_css()
+ return cls.preview_view_css
+
+ @classmethod
+ def get_studio_view_css(cls):
+ if issubclass(cls, XModuleDescriptor):
+ return cls.get_css()
+ return cls.studio_view_css
+
def get_html(self):
"""
Return the html used to display this snippet
@@ -258,7 +299,7 @@ class HTMLSnippet(object):
.format(self.__class__))
-def shim_xmodule_js(block, fragment):
+def shim_xmodule_js(fragment, js_module_name):
"""
Set up the XBlock -> XModule shim on the supplied :class:`web_fragments.fragment.Fragment`
"""
@@ -268,7 +309,7 @@ def shim_xmodule_js(block, fragment):
if not fragment.js_init_fn:
fragment.initialize_js('XBlockToXModuleShim')
- fragment.json_init_args = {'xmodule-type': block.js_module_name}
+ fragment.json_init_args = {'xmodule-type': js_module_name}
add_webpack_to_fragment(fragment, 'XModuleShim')
@@ -831,8 +872,52 @@ descriptor_attr = partial(ProxyAttribute, 'descriptor') # pylint: disable=inval
module_runtime_attr = partial(ProxyAttribute, 'xmodule_runtime') # pylint: disable=invalid-name
+class XModuleToXBlockMixin(object):
+ """
+ Common code needed by XModule and XBlocks converted from XModules.
+ """
+ @property
+ def ajax_url(self):
+ """
+ Returns the URL for the ajax handler.
+ """
+ return self.runtime.handler_url(self, 'xmodule_handler', '', '').rstrip('/?')
+
+ @XBlock.handler
+ def xmodule_handler(self, request, suffix=None):
+ """
+ XBlock handler that wraps `handle_ajax`
+ """
+ class FileObjForWebobFiles(object):
+ """
+ Turn Webob cgi.FieldStorage uploaded files into pure file objects.
+
+ Webob represents uploaded files as cgi.FieldStorage objects, which
+ have a .file attribute. We wrap the FieldStorage object, delegating
+ attribute access to the .file attribute. But the files have no
+ name, so we carry the FieldStorage .filename attribute as the .name.
+
+ """
+ def __init__(self, webob_file):
+ self.file = webob_file.file
+ self.name = webob_file.filename
+
+ def __getattr__(self, name):
+ return getattr(self.file, name)
+
+ # WebOb requests have multiple entries for uploaded files. handle_ajax
+ # expects a single entry as a list.
+ request_post = MultiDict(request.POST)
+ for key in set(request.POST.iterkeys()):
+ if hasattr(request.POST[key], "file"):
+ request_post[key] = map(FileObjForWebobFiles, request.POST.getall(key))
+
+ response_data = self.handle_ajax(suffix, request_post)
+ return Response(response_data, content_type='application/json', charset='UTF-8')
+
+
@XBlock.needs("i18n")
-class XModule(HTMLSnippet, XModuleMixin):
+class XModule(XModuleToXBlockMixin, HTMLSnippet, XModuleMixin):
""" Implements a generic learning module.
Subclasses must at a minimum provide a definition for get_html in order
@@ -885,38 +970,6 @@ class XModule(HTMLSnippet, XModuleMixin):
data is a dictionary-like object with the content of the request"""
return u""
- @XBlock.handler
- def xmodule_handler(self, request, suffix=None):
- """
- XBlock handler that wraps `handle_ajax`
- """
- class FileObjForWebobFiles(object):
- """
- Turn Webob cgi.FieldStorage uploaded files into pure file objects.
-
- Webob represents uploaded files as cgi.FieldStorage objects, which
- have a .file attribute. We wrap the FieldStorage object, delegating
- attribute access to the .file attribute. But the files have no
- name, so we carry the FieldStorage .filename attribute as the .name.
-
- """
- def __init__(self, webob_file):
- self.file = webob_file.file
- self.name = webob_file.filename
-
- def __getattr__(self, name):
- return getattr(self.file, name)
-
- # WebOb requests have multiple entries for uploaded files. handle_ajax
- # expects a single entry as a list.
- request_post = MultiDict(request.POST)
- for key in set(request.POST.iterkeys()):
- if hasattr(request.POST[key], "file"):
- request_post[key] = map(FileObjForWebobFiles, request.POST.getall(key))
-
- response_data = self.handle_ajax(suffix, request_post)
- return Response(response_data, content_type='application/json', charset='UTF-8')
-
def get_child(self, usage_id):
if usage_id in self._child_cache:
return self._child_cache[usage_id]
@@ -1041,23 +1094,10 @@ class ResourceTemplates(object):
return template
-@XBlock.needs("i18n")
-class XModuleDescriptor(HTMLSnippet, ResourceTemplates, XModuleMixin):
+class XModuleDescriptorToXBlockMixin(object):
"""
- An XModuleDescriptor is a specification for an element of a course. This
- could be a problem, an organizational element (a group of content), or a
- segment of video, for example.
-
- XModuleDescriptors are independent and agnostic to the current student state
- on a problem. They handle the editing interface used by instructors to
- create a problem, and can generate XModules (which do know about student
- state).
+ Common code needed by XModuleDescriptor and XBlocks converted from XModules.
"""
-
- entry_point = "xmodule.v1"
-
- module_class = XModule
-
# VS[compat]. Backwards compatibility code that can go away after
# importing 2012 courses.
# A set of metadata key conversions that we want to make
@@ -1066,33 +1106,6 @@ class XModuleDescriptor(HTMLSnippet, ResourceTemplates, XModuleMixin):
'name': 'display_name',
}
- # ============================= STRUCTURAL MANIPULATION ===================
- def __init__(self, *args, **kwargs):
- """
- Construct a new XModuleDescriptor. The only required arguments are the
- system, used for interaction with external resources, and the
- definition, which specifies all the data needed to edit and display the
- problem (but none of the associated metadata that handles recordkeeping
- around the problem).
-
- This allows for maximal flexibility to add to the interface while
- preserving backwards compatibility.
-
- runtime: A DescriptorSystem for interacting with external resources
-
- field_data: A dictionary-like object that maps field names to values
- for those fields.
-
- XModuleDescriptor.__init__ takes the same arguments as xblock.core:XBlock.__init__
- """
- super(XModuleDescriptor, self).__init__(*args, **kwargs)
- # update_version is the version which last updated this xblock v prev being the penultimate updater
- # leaving off original_version since it complicates creation w/o any obv value yet and is computable
- # by following previous until None
- # definition_locator is only used by mongostores which separate definitions from blocks
- self.previous_version = self.update_version = self.definition_locator = None
- self.xmodule_runtime = None
-
@classmethod
def _translate(cls, key):
return cls.metadata_translations.get(key, key)
@@ -1160,6 +1173,51 @@ class XModuleDescriptor(HTMLSnippet, ResourceTemplates, XModuleMixin):
"""
raise NotImplementedError('Modules must implement export_to_xml to enable xml export')
+
+@XBlock.needs("i18n")
+class XModuleDescriptor(XModuleDescriptorToXBlockMixin, HTMLSnippet, ResourceTemplates, XModuleMixin):
+ """
+ An XModuleDescriptor is a specification for an element of a course. This
+ could be a problem, an organizational element (a group of content), or a
+ segment of video, for example.
+
+ XModuleDescriptors are independent and agnostic to the current student state
+ on a problem. They handle the editing interface used by instructors to
+ create a problem, and can generate XModules (which do know about student
+ state).
+ """
+
+ entry_point = "xmodule.v1"
+
+ module_class = XModule
+
+ # ============================= STRUCTURAL MANIPULATION ===================
+ def __init__(self, *args, **kwargs):
+ """
+ Construct a new XModuleDescriptor. The only required arguments are the
+ system, used for interaction with external resources, and the
+ definition, which specifies all the data needed to edit and display the
+ problem (but none of the associated metadata that handles recordkeeping
+ around the problem).
+
+ This allows for maximal flexibility to add to the interface while
+ preserving backwards compatibility.
+
+ runtime: A DescriptorSystem for interacting with external resources
+
+ field_data: A dictionary-like object that maps field names to values
+ for those fields.
+
+ XModuleDescriptor.__init__ takes the same arguments as xblock.core:XBlock.__init__
+ """
+ super(XModuleDescriptor, self).__init__(*args, **kwargs)
+ # update_version is the version which last updated this xblock v prev being the penultimate updater
+ # leaving off original_version since it complicates creation w/o any obv value yet and is computable
+ # by following previous until None
+ # definition_locator is only used by mongostores which separate definitions from blocks
+ self.previous_version = self.update_version = self.definition_locator = None
+ self.xmodule_runtime = None
+
def editor_saved(self, user, old_metadata, old_content):
"""
This method is called when "Save" is pressed on the Studio editor.
diff --git a/common/lib/xmodule/xmodule/xml_module.py b/common/lib/xmodule/xmodule/xml_module.py
index faf33b4807..20c5b02e07 100644
--- a/common/lib/xmodule/xmodule/xml_module.py
+++ b/common/lib/xmodule/xmodule/xml_module.py
@@ -512,7 +512,7 @@ class XmlParserMixin(object):
return non_editable_fields
-class XmlDescriptor(XmlParserMixin, XModuleDescriptor): # pylint: disable=abstract-method
+class XmlMixin(XmlParserMixin):
"""
Mixin class for standardized parsing of XModule xml.
"""
@@ -538,7 +538,7 @@ class XmlDescriptor(XmlParserMixin, XModuleDescriptor): # pylint: disable=abstr
# This only exists to satisfy subclasses that both:
# a) define from_xml themselves
# b) call super(..).from_xml(..)
- return super(XmlDescriptor, cls).parse_xml(
+ return super(XmlMixin, cls).parse_xml(
etree.fromstring(xml_data),
system,
None, # This is ignored by XmlParserMixin
@@ -550,12 +550,12 @@ class XmlDescriptor(XmlParserMixin, XModuleDescriptor): # pylint: disable=abstr
"""
Interpret the parsed XML in `node`, creating an XModuleDescriptor.
"""
- if cls.from_xml != XmlDescriptor.from_xml:
+ if cls.from_xml != XmlMixin.from_xml:
# Skip the parse_xml from XmlParserMixin to get the shim parse_xml
# from XModuleDescriptor, which actually calls `from_xml`.
return super(XmlParserMixin, cls).parse_xml(node, runtime, keys, id_generator) # pylint: disable=bad-super-call
else:
- return super(XmlDescriptor, cls).parse_xml(node, runtime, keys, id_generator)
+ return super(XmlMixin, cls).parse_xml(node, runtime, keys, id_generator)
def export_to_xml(self, resource_fs):
"""
@@ -575,7 +575,7 @@ class XmlDescriptor(XmlParserMixin, XModuleDescriptor): # pylint: disable=abstr
# a) define export_to_xml themselves
# b) call super(..).export_to_xml(..)
node = Element(self.category)
- super(XmlDescriptor, self).add_xml_to_node(node)
+ super(XmlMixin, self).add_xml_to_node(node)
return etree.tostring(node)
def add_xml_to_node(self, node):
@@ -583,9 +583,13 @@ class XmlDescriptor(XmlParserMixin, XModuleDescriptor): # pylint: disable=abstr
Export this :class:`XModuleDescriptor` as XML, by setting attributes on the provided
`node`.
"""
- if self.export_to_xml != XmlDescriptor.export_to_xml:
+ if self.export_to_xml != XmlMixin.export_to_xml:
# Skip the add_xml_to_node from XmlParserMixin to get the shim add_xml_to_node
# from XModuleDescriptor, which actually calls `export_to_xml`.
super(XmlParserMixin, self).add_xml_to_node(node) # pylint: disable=bad-super-call
else:
- super(XmlDescriptor, self).add_xml_to_node(node)
+ super(XmlMixin, self).add_xml_to_node(node)
+
+
+class XmlDescriptor(XmlMixin, XModuleDescriptor):
+ pass
diff --git a/common/static/common/js/components/PortfolioExperimentUpsellModal.jsx b/common/static/common/js/components/PortfolioExperimentUpsellModal.jsx
deleted file mode 100644
index 2b47d8fe39..0000000000
--- a/common/static/common/js/components/PortfolioExperimentUpsellModal.jsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Modal, Button } from '@edx/paragon/static';
-
-import ExperimentalCarousel from './ExperimentalCarousel.jsx';
-
-// https://openedx.atlassian.net/browse/LEARNER-3926
-
-export class PortfolioExperimentUpsellModal extends React.Component {
- constructor(props) {
- super(props);
-
- this.state = { isOpen: true };
- }
-
- render() {
- const slides = [
- (
-
),
- (Upgrade to access new content: a guide for building an online portfolio and creating your first project.
-By following the guide you will:
- -
-
- Use your new coding skills -
- Begin to build your portfolio -
- Share what you can do! -
-
),
- (Use Your New Coding Skills
-Want to practice what you've learned? We'll give you the project idea to create your own portfolio. Get creative!
-
-
),
- (Build Your Portfolio
-Apply your knowledge and show them you can code - this project is the perfect start to your portfolio.
-
-
),
- ];
-
- const body = (
- Share What You Can Do
-Get tips on where to store your project and the best way to share it with employers.
-
- 
-
- );
-
- return (
-
-