diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 904481096d3..1c5c9693c79 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -176,7 +176,7 @@ class email_template(osv.osv): 'mail_server_id': fields.many2one('ir.mail_server', 'Outgoing Mail Server', readonly=False, help="Optional preferred server for outgoing mails. If not set, the highest " "priority one will be used."), - 'body_html': fields.text('Body', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"), + 'body_html': fields.html('Body', translate=True, help="Rich-text/HTML version of the message (placeholders may be used here)"), 'report_name': fields.char('Report Filename', translate=True, help="Name to use for the generated report file (may contain placeholders)\n" "The extension can be omitted and will then come from the report type."), diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index 6c0a062125d..ee4b0caf90e 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -148,10 +148,13 @@ }); self.$el.css('top', this.parent.get('height')); }, + _get_snippet_url: function () { + return '/website/snippets'; + }, fetch_snippet_templates: function () { var self = this; - openerp.jsonRpc("/website/snippets", 'call', {}) + openerp.jsonRpc(this._get_snippet_url(), 'call', {}) .then(function (html) { var $html = $(html); diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml index 14defa7bc1a..9682d2f17e2 100644 --- a/addons/website/views/website_templates.xml +++ b/addons/website/views/website_templates.xml @@ -75,7 +75,7 @@ - +
@@ -196,7 +196,7 @@