From 7c540bc4ee251f4e9c7a4785203287a1da98bac2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Mon, 14 Jul 2014 13:42:29 +0200
Subject: [PATCH] [FIX] exception rendering with pretty printed XML
had not been migrated to lxml
---
addons/website/views/website_templates.xml | 2 +-
openerp/addons/base/ir/ir_qweb.py | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index dab436390a0b..36104f446e21 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -507,7 +507,7 @@
<t t-if="'expression' in qweb_exception.qweb">and evaluating the following expression: <code t-esc="qweb_exception.qweb['expression']"/></t>
</p>
<t t-if="'node' in qweb_exception.qweb">
- <pre id="exception_node" t-esc="qweb_exception.qweb['node'].toxml()"/>
+ <pre id="exception_node" t-esc="qweb_exception.pretty_xml()"/>
</t>
</div>
</div>
diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index 30763a655dfb..918f54f8bc5a 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -40,6 +40,10 @@ class QWebException(Exception):
def __init__(self, message, **kw):
Exception.__init__(self, message)
self.qweb = dict(kw)
+ def pretty_xml(self):
+ if 'node' not in self.qweb:
+ return ''
+ return etree.tostring(self.qweb['node'], pretty_print=True)
class QWebTemplateNotFound(QWebException):
pass
--
GitLab