From fc8281d517c737f87d3db8d5c48f50de675cf14d Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Thu, 13 Dec 2012 09:22:01 -0500 Subject: [PATCH 1/3] up the template caching version number to avoid stale caches since there's been a change to the underscore templates --- cms/static/js/template_loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/static/js/template_loader.js b/cms/static/js/template_loader.js index 6fb3ea2af1..2d6513632d 100644 --- a/cms/static/js/template_loader.js +++ b/cms/static/js/template_loader.js @@ -5,7 +5,7 @@ if (typeof window.templateLoader == 'function') return; var templateLoader = { - templateVersion: "0.0.9", + templateVersion: "0.0.10", templates: {}, loadRemoteTemplate: function(templateName, filename, callback) { if (!this.templates[templateName]) { From 3421331f1784ab91d4b7015e5842b330eebe058f Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Thu, 13 Dec 2012 09:25:13 -0500 Subject: [PATCH 2/3] up the template caching version number to avoid stale caches since there's been a change to the underscore templates --- cms/static/js/template_loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/static/js/template_loader.js b/cms/static/js/template_loader.js index 2d6513632d..365e16bf64 100644 --- a/cms/static/js/template_loader.js +++ b/cms/static/js/template_loader.js @@ -5,7 +5,7 @@ if (typeof window.templateLoader == 'function') return; var templateLoader = { - templateVersion: "0.0.10", + templateVersion: "0.0.11", templates: {}, loadRemoteTemplate: function(templateName, filename, callback) { if (!this.templates[templateName]) { From 4ebc9a589d06ccfe450179052469999278afe234 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Thu, 13 Dec 2012 11:29:00 -0500 Subject: [PATCH 3/3] fix up some test failures --- cms/djangoapps/contentstore/tests/test_course_settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms/djangoapps/contentstore/tests/test_course_settings.py b/cms/djangoapps/contentstore/tests/test_course_settings.py index 67ff10bc50..e71f05de30 100644 --- a/cms/djangoapps/contentstore/tests/test_course_settings.py +++ b/cms/djangoapps/contentstore/tests/test_course_settings.py @@ -9,7 +9,7 @@ from xmodule.modulestore import Location from cms.djangoapps.models.settings.course_details import CourseDetails,\ CourseSettingsEncoder import json -from common.djangoapps.util import converters +from util import converters import calendar # YYYY-MM-DDThh:mm:ss.s+/-HH:MM