Skip to content
Snippets Groups Projects
Commit 39de3797 authored by Christophe Simonis's avatar Christophe Simonis
Browse files

[MERGE] forward port branch 10.0 up to cb3bf550

parents 36fdb2ff cb3bf550
Branches
Tags
No related merge requests found
......@@ -168,10 +168,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):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment