[MERGE] forward port branch saas-14 up to 3bac72ba741

2 files changed, 14 insertions, 2 deletions

diff --git a/addons/web_editor/models/ir_ui_view.py b/addons/web_editor/models/ir_ui_view.py
index 2dc9cba0fdb..dc81b6a44d6 100644
--- a/addons/web_editor/models/ir_ui_view.py
+++ b/addons/web_editor/models/ir_ui_view.py
@@ -6,7 +6,7 @@ import logging
 from lxml import etree, html
 
 from odoo.exceptions import AccessError
-from odoo import api, models
+from odoo import api, fields, models
 
 _logger = logging.getLogger(__name__)
 
@@ -34,6 +34,10 @@ class IrUiView(models.Model):
         return arch.xpath('//*[@data-oe-model != "ir.ui.view"]')
 
     @api.model
+    def get_default_lang_code(self):
+        return False
+
+    @api.model
     def save_embedded_field(self, el):
         Model = self.env[el.get('data-oe-model')]
         field = el.get('data-oe-field')
@@ -44,7 +48,10 @@ class IrUiView(models.Model):
 
         if value is not None:
             # TODO: batch writes?
-            Model.browse(int(el.get('data-oe-id'))).write({field: value})
+            if self.get_default_lang_code() and field != 'arch' and not isinstance(Model._fields[field], fields.Html):
+                Model.browse(int(el.get('data-oe-id'))).with_context(lang=self.get_default_lang_code()).write({field: value})
+            else:
+                Model.browse(int(el.get('data-oe-id'))).write({field: value})
 
     def _pretty_arch(self, arch):
         # remove_blank_string does not seem to work on HTMLParser, and
diff --git a/addons/web_editor/static/src/js/backend.js b/addons/web_editor/static/src/js/backend.js
index 1c6f069ae3c..7d22186c0a8 100644
--- a/addons/web_editor/static/src/js/backend.js
+++ b/addons/web_editor/static/src/js/backend.js
@@ -183,6 +183,11 @@ var FieldTextHtml = widget.extend({
     template: 'web_editor.FieldTextHtml',
     willStart: function () {
         var self = this;
+
+        if (this.field.translate === false) {
+            this.languages = [];
+            return $.when();
+        }
         return new Model('res.lang').call("search_read", [[['code', '!=', 'en_US']], ["name", "code"]]).then(function (res) {
             self.languages = res;
         });