From 2955bf2651d4f799bcd1248afbf8520262f78668 Mon Sep 17 00:00:00 2001 From: Nicolas Lempereur Date: Thu, 29 Jun 2017 15:43:00 +0200 Subject: [FIX] web_editor: translation and no default en_US Before 036ccbef when writing on qweb field with default language mi_SC: - writing in mi_SC: wrote on the current res.user language (wrong) - writing in en_US: wrote on en_US translation (right) - writing in de_DE: wrote on de_DE translation (right) but after 036ccbef: - writing in mi_SC: wrote on mi_SC (right) - writing in en_US: wrote on mi_SC (wrong) - writing in de_DE: wrote on mi_SC (wrong) With this commit, this drawback is also solved by keeping the lang in context if present. opw-746776 closes #17917 --- addons/web_editor/models/ir_ui_view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web_editor/models') diff --git a/addons/web_editor/models/ir_ui_view.py b/addons/web_editor/models/ir_ui_view.py index 48a94e4b8cb..3aa6bac4713 100644 --- a/addons/web_editor/models/ir_ui_view.py +++ b/addons/web_editor/models/ir_ui_view.py @@ -48,7 +48,7 @@ class IrUiView(models.Model): if value is not None: # TODO: batch writes? - if self.get_default_lang_code() and field != 'arch' and not isinstance(Model._fields[field], fields.Html): + if not self.env.context.get('lang') and self.get_default_lang_code(): 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}) -- cgit v1.2.3 From b3e7753d1b63808d17eea04deab35aaf817ec31f Mon Sep 17 00:00:00 2001 From: Nicolas Lempereur Date: Fri, 30 Jun 2017 12:59:50 +0200 Subject: [FIX] web{site,_editor}: allow edit en_US field If the website default language is not en_US, qweb fields are not translatable in en_US (and thus can't be translated) because: - the code expected en_US to be the default language. - there was a error in website _dispatch opw-746776 closes #17939 --- addons/web_editor/models/ir_http.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web_editor/models') diff --git a/addons/web_editor/models/ir_http.py b/addons/web_editor/models/ir_http.py index c72fee55e83..874ccc6eddb 100644 --- a/addons/web_editor/models/ir_http.py +++ b/addons/web_editor/models/ir_http.py @@ -11,6 +11,6 @@ class ir_http(orm.AbstractModel): request.context['editable'] = True if 'edit_translations' in request.httprequest.args and 'edit_translations' not in request.context: request.context['edit_translations'] = True - if request.context.get('lang') != "en_US" and 'translatable' not in request.context: + if request.context.get('edit_translations') and 'translatable' not in request.context: request.context['translatable'] = True return super(ir_http, self)._dispatch() -- cgit v1.2.3