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

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

parents 0375c017 d649cab7
No related branches found
No related tags found
No related merge requests found
......@@ -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):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment