pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-15 up to d649cab7b9

Browse Source
This commit is contained in:
Christophe Simonis
2019-07-25 11:43:19 +02:00
parent 0375c0174d d649cab7b9
commit f2f24381f2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/models/ir_ui_view.py
+3 -3
View File
@@ -169,10 +169,10 @@ class IrUiView(models.Model):
if called_view not in views_to_return: if called_view not in views_to_return:
views_to_return += self._views_get(called_view, options=options, bundles=bundles) views_to_return += self._views_get(called_view, options=options, bundles=bundles)
extensions = view.inherit_children_ids
if not options: if not options:
# only active children return views_to_return
extensions = view.inherit_children_ids.filtered(lambda view: view.active)
extensions = view.inherit_children_ids
# Keep options in a deterministic order regardless of their applicability # Keep options in a deterministic order regardless of their applicability
for extension in extensions.sorted(key=lambda v: v.id): for extension in extensions.sorted(key=lambda v: v.id):