From 79e48dde97d6f16876a67be43f5fa2a1aca8aaa1 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Mon, 10 Dec 2012 10:01:08 -0500 Subject: [PATCH] move the underscore tempaltes to /static/client-templates and update the references --- .../src => }/client_templates/course_info_handouts.html | 0 .../{coffee/src => }/client_templates/course_info_update.html | 0 .../{coffee/src => }/client_templates/load_templates.html | 0 cms/static/js/template_loader.js | 2 +- cms/static/js/views/course_info_edit.js | 4 ++-- common/djangoapps/util/json_request.py | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename cms/static/{coffee/src => }/client_templates/course_info_handouts.html (100%) rename cms/static/{coffee/src => }/client_templates/course_info_update.html (100%) rename cms/static/{coffee/src => }/client_templates/load_templates.html (100%) diff --git a/cms/static/coffee/src/client_templates/course_info_handouts.html b/cms/static/client_templates/course_info_handouts.html similarity index 100% rename from cms/static/coffee/src/client_templates/course_info_handouts.html rename to cms/static/client_templates/course_info_handouts.html diff --git a/cms/static/coffee/src/client_templates/course_info_update.html b/cms/static/client_templates/course_info_update.html similarity index 100% rename from cms/static/coffee/src/client_templates/course_info_update.html rename to cms/static/client_templates/course_info_update.html diff --git a/cms/static/coffee/src/client_templates/load_templates.html b/cms/static/client_templates/load_templates.html similarity index 100% rename from cms/static/coffee/src/client_templates/load_templates.html rename to cms/static/client_templates/load_templates.html diff --git a/cms/static/js/template_loader.js b/cms/static/js/template_loader.js index a18ddf3dfe..2e900814b0 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.6", + templateVersion: "0.0.8", templates: {}, loadRemoteTemplate: function(templateName, filename, callback) { if (!this.templates[templateName]) { diff --git a/cms/static/js/views/course_info_edit.js b/cms/static/js/views/course_info_edit.js index 9f662a0697..7f8d9f3e16 100644 --- a/cms/static/js/views/course_info_edit.js +++ b/cms/static/js/views/course_info_edit.js @@ -38,7 +38,7 @@ CMS.Views.ClassInfoUpdateView = Backbone.View.extend({ // instantiates an editor template for each update in the collection window.templateLoader.loadRemoteTemplate("course_info_update", // TODO Where should the template reside? how to use the static.url to create the path? - "/static/coffee/src/client_templates/course_info_update.html", + "/static/client_templates/course_info_update.html", function (raw_template) { self.template = _.template(raw_template); self.render(); @@ -209,7 +209,7 @@ CMS.Views.ClassInfoHandoutsView = Backbone.View.extend({ { complete: function() { window.templateLoader.loadRemoteTemplate("course_info_handouts", - "/static/coffee/src/client_templates/course_info_handouts.html", + "/static/client_templates/course_info_handouts.html", function (raw_template) { self.template = _.template(raw_template); self.render(); diff --git a/common/djangoapps/util/json_request.py b/common/djangoapps/util/json_request.py index 169a7e3fb4..f1989b01ff 100644 --- a/common/djangoapps/util/json_request.py +++ b/common/djangoapps/util/json_request.py @@ -8,7 +8,7 @@ def expect_json(view_function): def expect_json_with_cloned_request(request, *args, **kwargs): # cdodge: fix postback errors in CMS. The POST 'content-type' header can include additional information # e.g. 'charset', so we can't do a direct string compare - if request.META['CONTENT_TYPE'].lower().startswith("application/json"): + if request.META.get('CONTENT_TYPE','').lower().startswith("application/json"): cloned_request = copy.copy(request) cloned_request.POST = cloned_request.POST.copy() cloned_request.POST.update(json.loads(request.body))