From 529ae92d1e409b10e8e2afc6b1b1fe1e76a7af89 Mon Sep 17 00:00:00 2001 From: Britlog Date: Fri, 3 Nov 2017 05:11:43 +0100 Subject: [PATCH 1/2] Encoding error on web form rendering (#4418) --- frappe/website/doctype/web_form/templates/web_form.html | 2 +- frappe/website/doctype/web_form/web_form.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/web_form/templates/web_form.html b/frappe/website/doctype/web_form/templates/web_form.html index df0fa1de3e..fb7c84b5e9 100644 --- a/frappe/website/doctype/web_form/templates/web_form.html +++ b/frappe/website/doctype/web_form/templates/web_form.html @@ -369,7 +369,7 @@ window.web_form_settings = { {% endblock %} diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py index 43480df9b4..c0ca1c2e77 100644 --- a/frappe/website/doctype/web_form/web_form.py +++ b/frappe/website/doctype/web_form/web_form.py @@ -255,7 +255,7 @@ def get_context(context): js_path = os.path.join(os.path.dirname(self.web_form_module.__file__), scrub(self.name) + '.js') if os.path.exists(js_path): - context.script = frappe.render_template(open(js_path, 'r').read(), context) + context.script = frappe.render_template(open(js_path, 'r').read().decode('utf-8'), context) css_path = os.path.join(os.path.dirname(self.web_form_module.__file__), scrub(self.name) + '.css') if os.path.exists(css_path): From 2b1b046c23e0b5fb16c591b0a1768d34eafdfd94 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Fri, 3 Nov 2017 12:22:58 +0600 Subject: [PATCH 2/2] bumped to version 9.2.5 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index f09be0ecae..198c30590d 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '9.2.4' +__version__ = '9.2.5' __title__ = "Frappe Framework" local = Local()