From 1bc648b3bd60ea790e8e1cbcd44612d3bf0d12e0 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Thu, 5 Jun 2014 13:16:28 +0530
Subject: [PATCH] added frappe.render_template and fixed string to html
 formatting

---
 frappe/__init__.py                         | 5 +++++
 frappe/public/js/frappe/form/formatters.js | 3 ++-
 frappe/public/js/legacy/print_format.js    | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 2ede0f5e07..9cb0aeb2ce 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -638,6 +638,11 @@ def set_filters(jenv):
 def get_template(path):
 	return get_jenv().get_template(path)
 
+def render_template(template, context):
+	from jinja2 import Template
+	template = Template(template)
+	return template.render(**context)
+
 def get_website_route(doctype, name):
 	return db.get_value("Website Route", {"ref_doctype": doctype, "docname": name})
 
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 64de2be9ba..e99158a1ab 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -57,12 +57,13 @@ frappe.form.formatters = {
 	},
 	Text: function(value) {
 		if(value) {
-			var tags = ["<p[^>]>", "<div[^>]>", "<br[^>]>"];
+			var tags = ["<p", "<div", "<br"];
 			var match = false;
 
 			for(var i=0; i<tags.length; i++) {
 				if(value.match(tags[i])) {
 					match = true;
+					break;
 				}
 			}
 
diff --git a/frappe/public/js/legacy/print_format.js b/frappe/public/js/legacy/print_format.js
index deb074aacc..bf1a486999 100644
--- a/frappe/public/js/legacy/print_format.js
+++ b/frappe/public/js/legacy/print_format.js
@@ -297,11 +297,12 @@ $.extend(_p, {
 	},
 
 	add_span: function(html) {
-		var tags = ["<span[^>]>", "<p[^>]>", "<div[^>]>", "<br[^>]>", "<table[^>]>"];
+		var tags = ["<span", "<p", "<div", "<br", "<table"];
 		var match = false;
 		for(var i=0; i<tags.length; i++) {
 			if(html.match(tags[i])) {
 				match = true;
+				break;
 			}
 		}