diff --git a/cms/static/js/views/xblock.js b/cms/static/js/views/xblock.js index 2330c9deb510..6b913d5239da 100644 --- a/cms/static/js/views/xblock.js +++ b/cms/static/js/views/xblock.js @@ -23,9 +23,10 @@ function($, _, ViewUtils, BaseView, XBlock, HtmlUtils) { var self = this, view = this.view, xblockInfo = this.model, - xblockUrl = xblockInfo.url(); + xblockUrl = xblockInfo.url(), + querystring = window.location.search; // pass any querystring down to child views return $.ajax({ - url: decodeURIComponent(xblockUrl) + '/' + view, + url: decodeURIComponent(xblockUrl) + '/' + view + querystring, type: 'GET', cache: false, headers: {Accept: 'application/json'}, diff --git a/openedx/core/lib/xblock_utils/__init__.py b/openedx/core/lib/xblock_utils/__init__.py index bb7f78e523fc..0910018f6046 100644 --- a/openedx/core/lib/xblock_utils/__init__.py +++ b/openedx/core/lib/xblock_utils/__init__.py @@ -452,7 +452,7 @@ def xblock_resource_pkg(block): ProblemBlock, and most other built-in blocks currently. Handling for these assets does not interact with this function. 2. The (preferred) standard XBlock runtime resource loading system, used by - LibrarySourdedBlock. Handling for these assets *does* interact with this + LibrarySourcedBlock. Handling for these assets *does* interact with this function. We hope to migrate to (2) eventually, tracked by: diff --git a/xmodule/assets/README.rst b/xmodule/assets/README.rst index c63fd5126d35..c87642384f6d 100644 --- a/xmodule/assets/README.rst +++ b/xmodule/assets/README.rst @@ -1,7 +1,7 @@ xmodule/assets: edx-platform XBlock resources ############################################# -This folder exists to contain resources (ie, static assets) for the XBlocks +This folder exists to contain resources (i.e., static assets) for the XBlocks defined in edx-platform. Concepts