From 4c97d16edc6aca1cc34ac08f880273e0f0b4a382 Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Tue, 28 May 2013 23:40:16 -0400 Subject: [PATCH 1/9] add hack to assets.rake to unblock the release train --- rakefiles/assets.rake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rakefiles/assets.rake b/rakefiles/assets.rake index c0757b712b84..68127a317f4f 100644 --- a/rakefiles/assets.rake +++ b/rakefiles/assets.rake @@ -10,11 +10,14 @@ end # the ENV_TOKENS to the templating context. def preprocess_with_mako(filename) # simple command-line invocation of Mako engine + # cdodge: the .gsub() are used to translate true->True and false->False to make the generated + # python actually valid python. This is just a short term hack to unblock the release train + # until a real fix can be made by people who know this better mako = "from mako.template import Template;" + "print Template(filename=\"#{filename}\")" + # Total hack. It works because a Python dict literal has # the same format as a JSON object. - ".render(env=#{ENV_TOKENS.to_json});" + ".render(env=#{ENV_TOKENS.to_json.gsub("true","True").gsub("false","False")});" # strip off the .mako extension output_filename = filename.chomp(File.extname(filename)) From 879f7d1051c4583c52909b59622216deff296e1e Mon Sep 17 00:00:00 2001 From: Chris Dodge Date: Wed, 29 May 2013 12:11:25 -0400 Subject: [PATCH 2/9] fix Edge login to use the updated POST-back URL /login -> /login_ajax --- lms/templates/university_profile/edge.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/templates/university_profile/edge.html b/lms/templates/university_profile/edge.html index a3e115ddd894..9e6adfe3d8fb 100644 --- a/lms/templates/university_profile/edge.html +++ b/lms/templates/university_profile/edge.html @@ -9,7 +9,7 @@