From cc2686f398bb500e34d75c2c61569560e411705c Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Mon, 18 May 2015 10:18:36 +0100 Subject: [PATCH] Revert "Tidy up render_modal_workflow" This reverts commit 1505e0b789965070d6366d2d0a00e89e2243ba65. --- wagtail/wagtailadmin/modal_workflow.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/wagtail/wagtailadmin/modal_workflow.py b/wagtail/wagtailadmin/modal_workflow.py index 1261b4ba31..94c8c2d0f1 100644 --- a/wagtail/wagtailadmin/modal_workflow.py +++ b/wagtail/wagtailadmin/modal_workflow.py @@ -6,18 +6,20 @@ from wagtail.utils.compat import render_to_string def render_modal_workflow(request, html_template, js_template, template_vars=None): - """ + """" Render a response consisting of an HTML chunk and a JS onload chunk in the format required by the modal-workflow framework. """ - response_keyvars = {} + response_keyvars = [] if html_template: html = render_to_string(html_template, template_vars or {}, request=request) - response_keyvars['html'] = html + response_keyvars.append("'html': %s" % json.dumps(html)) if js_template: js = render_to_string(js_template, template_vars or {}, request=request) - response_keyvars['onload'] = js + response_keyvars.append("'onload': %s" % js) - return HttpResponse(json.dumps(response_keyvars), content_type="application/json") + response_text = "{%s}" % ','.join(response_keyvars) + + return HttpResponse(response_text, content_type="text/javascript")