diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-07-25 11:43:19 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-07-25 11:43:19 +0200 |
| commit | f2f24381f2eea81c2a491f1d26032fd7fe83fc4f (patch) | |
| tree | e40b729ebf45edd56bf9ca18e73f18db8332b759 /addons | |
| parent | 0375c0174da4f6489ecbace7740fdccec106b8e1 (diff) | |
| parent | d649cab7b91f14ed17c3c0d80f5a65adb931219e (diff) | |
[MERGE] forward port branch saas-15 up to d649cab7b91
Diffstat (limited to 'addons')
| -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 9d6689a846f..07eb00ecf1e 100644 --- a/addons/web_editor/models/ir_ui_view.py +++ b/addons/web_editor/models/ir_ui_view.py @@ -169,10 +169,10 @@ class IrUiView(models.Model): if called_view not in views_to_return: views_to_return += self._views_get(called_view, options=options, bundles=bundles) - extensions = view.inherit_children_ids if not options: - # only active children - extensions = view.inherit_children_ids.filtered(lambda view: view.active) + return views_to_return + + extensions = view.inherit_children_ids # Keep options in a deterministic order regardless of their applicability for extension in extensions.sorted(key=lambda v: v.id): |