diff options
| author | Romain Derie <rde@odoo.com> | 2020-11-25 15:34:08 +0000 |
|---|---|---|
| committer | Romain Derie <rde@odoo.com> | 2020-11-27 10:23:42 +0000 |
| commit | 1aa4d3cb57844c24d8520b6b974bb36526392ecf (patch) | |
| tree | 7899ce646eb34d4f47d0686ab7a795f6f19c22d0 /odoo | |
| parent | 0281dee6da75e68403772ebd368d57c1feb98c37 (diff) | |
[FIX] base: ignore user lang when comparing with arch
Without this commit, when the compare/reset view feature was reading the arch,
it would translate it.
3 issues :
- When reading from file (hard reset), it would translate the file version
- When reading current arch, it would translate it
- When reading compare view arch, it would translate it
closes odoo/odoo#62433
X-original-commit: c33c6316b2d42d151a491b1b8940f876e091167b
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
Signed-off-by: Romain Derie <rdeodoo@users.noreply.github.com>
Diffstat (limited to 'odoo')
| -rw-r--r-- | odoo/addons/base/models/ir_ui_view.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/odoo/addons/base/models/ir_ui_view.py b/odoo/addons/base/models/ir_ui_view.py index 545391e3334..5d778d66f72 100644 --- a/odoo/addons/base/models/ir_ui_view.py +++ b/odoo/addons/base/models/ir_ui_view.py @@ -1887,10 +1887,10 @@ class ResetViewArchWizard(models.TransientModel): diff_to = view.view_id.arch_prev diff_to_name = _("Previous Arch") elif view.reset_mode == 'other_view': - diff_to = view.compare_view_id.arch + diff_to = view.compare_view_id.with_context(lang=None).arch diff_to_name = get_table_name(view.compare_view_id) elif view.reset_mode == 'hard' and view.view_id.arch_fs: - diff_to = view.view_id.with_context(read_arch_from_file=True).arch + diff_to = view.view_id.with_context(read_arch_from_file=True, lang=None).arch diff_to_name = _("File Arch") view.arch_to_compare = diff_to @@ -1899,11 +1899,12 @@ class ResetViewArchWizard(models.TransientModel): view.arch_diff = False view.has_diff = False else: + view_arch = view.view_id.with_context(lang=None).arch view.arch_diff = get_diff( - (view.view_id.arch, get_table_name(view.view_id) if view.reset_mode == 'other_view' else _("Current Arch")), + (view_arch, get_table_name(view.view_id) if view.reset_mode == 'other_view' else _("Current Arch")), (diff_to, diff_to_name), ) - view.has_diff = view.view_id.arch != diff_to + view.has_diff = view_arch != diff_to def reset_view_button(self): self.ensure_one() |