From e653af4da2e9e8ad83572ed1ea2259ef14d9becf Mon Sep 17 00:00:00 2001 From: Waqas Khalid Date: Thu, 18 Dec 2014 21:01:23 +0500 Subject: [PATCH 1/2] Tender widget inavailability stops loading studio page When tender_widget.js is inavailable studio page stops loading becuase of error in the requirejs. It is dependency in the requirejs so when it doesn't load it cause other dependencies to stop loading. TNL-1018 --- cms/templates/widgets/tender.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cms/templates/widgets/tender.html b/cms/templates/widgets/tender.html index 19c3f5269a..4f9b182a28 100644 --- a/cms/templates/widgets/tender.html +++ b/cms/templates/widgets/tender.html @@ -7,6 +7,14 @@ window.Tender = { hide_kb: 'true', widgetToggles: document.getElementsByClassName('show-tender') } -require(['tender']); +// In order to avoid requirejs timeout errors should tender not be +// available, we're not using domReady as a loader plugin here. +// For more details, please see the note at +// http://requirejs.org/docs/api.html#pageload +require(['domReady'], function (domReady) { + domReady(function () { + require(['tender']); + }); +}); % endif From 60bfb13b1aa0514537d8ca36f60f688b7b4072df Mon Sep 17 00:00:00 2001 From: Jesse Zoldak Date: Wed, 17 Dec 2014 12:24:15 -0500 Subject: [PATCH 2/2] for tests change the default xml data dir to a place where it will get cleaned up --- lms/envs/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/envs/test.py b/lms/envs/test.py index 91961db536..0968e8cd5b 100644 --- a/lms/envs/test.py +++ b/lms/envs/test.py @@ -131,7 +131,7 @@ update_module_store_settings( 'fs_root': TEST_ROOT / "data", }, xml_store_options={ - 'data_dir': mkdtemp(), # never inadvertently load all the XML courses + 'data_dir': mkdtemp(dir=TEST_ROOT), # never inadvertently load all the XML courses }, doc_store_settings={ 'host': MONGO_HOST,