pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 9.0 up to 5f9f4f4d9d

Browse Source
This commit is contained in:
Christophe Simonis
2017-03-01 14:07:15 +01:00
parent 1730dca101 5f9f4f4d9d
commit 5c4744cd1f
9 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/backend.js
+6 -1
View File
@@ -351,7 +351,12 @@ var FieldTextHtml = widget.extend({
});
},
render_value: function () {
if (this.lang !== this.view.dataset.context.lang || this.$iframe.attr('src').match(/[?&]edit_translations=1/)) {
if (this.$iframe.attr('src').match(/[?&]edit_translations=1/)) {
return;
}
// ONLY HAVE THIS IN 9.0 AND SAAS-11
var is_editor_onchange = this.get('value') === '<p>on_change_model_and_list</p>';
if (this.lang !== this.view.dataset.context.lang && !is_editor_onchange) {
return;
}
var value = (this.get('value') || "").replace(/^<p[^>]*>(\s*|<br\/?>)<\/p>$/, '');