[MERGE] forward port branch 10.0 up to cb3bf5509f

2019-07-25 11:41:33 +02:00
parent 36fdb2ff49 cb3bf5509f
commit 39de3797f8
1 changed files with 3 additions and 3 deletions
@@ -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):