From 4b5bf16065d913f3e40f868d8d4243bd38c5a6fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Thu, 19 Jul 2012 16:12:14 +0200 Subject: [PATCH] [IMP] mail: chatter: html messages displayed as html. bzr revid: tde@openerp.com-20120719141214-m5yyj74q65yoiruu --- addons/mail/static/src/js/mail.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 53f86fda893..3872a486565 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -754,7 +754,9 @@ openerp.mail = function(session) { record.mini_url = mail.ChatterUtils.get_image(this.session.prefix, this.session.session_id, 'res.users', 'avatar', record.user_id[0]); } // body text manipulation - record.body = mail.ChatterUtils.do_text_remove_html_tags(record.body); + if (record.subtype == 'plain') { + record.body = mail.ChatterUtils.do_text_remove_html_tags(record.body); + } record.body = mail.ChatterUtils.do_replace_expressions(record.body); // format date according to the user timezone record.date = session.web.format_value(record.date, {type:"datetime"});