diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-07-25 20:01:05 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-07-25 20:01:05 +0200 |
| commit | a4b1b532ea09f8cbb5f208fb24b57cbea04ea753 (patch) | |
| tree | 03290dade554f08cf1278ebecaf651c48924342b /addons/web_editor/models | |
| parent | 7e5a80abc666bfa4d5b50a2d717a0d0d72a23dbf (diff) | |
| parent | b82df99d7a86fa3bc2670f00a0ef025263362cda (diff) | |
[MERGE] forward port branch 12.0 up to b82df99d7a8
Diffstat (limited to 'addons/web_editor/models')
| -rw-r--r-- | addons/web_editor/models/ir_ui_view.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web_editor/models/ir_ui_view.py b/addons/web_editor/models/ir_ui_view.py index 44f136dc471..3eb4c376163 100644 --- a/addons/web_editor/models/ir_ui_view.py +++ b/addons/web_editor/models/ir_ui_view.py @@ -251,10 +251,10 @@ class IrUiView(models.Model): if called_view and called_view not in views_to_return: views_to_return += self._views_get(called_view, options=options, bundles=bundles) - extensions = self._view_get_inherited_children(view, options) if not options: - # only active children - extensions = extensions.filtered(lambda view: view.active) + return views_to_return + + extensions = self._view_get_inherited_children(view, options) # Keep options in a deterministic order regardless of their applicability for extension in extensions.sorted(key=lambda v: v.id): |