diff --git a/addons/website/models/website.py b/addons/website/models/website.py index e13fd743146..99b2ec78b3e 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -143,7 +143,8 @@ class Website(models.Model): # don't add child menu if parent is forbidden if menu.parent_id and menu.parent_id in menus: menu.parent_id._cache['child_id'] += (menu.id,) - + # prefetch every website.page and ir.ui.view at once + menus.mapped('is_visible') website.menu_id = menus and menus.filtered(lambda m: not m.parent_id)[0].id or False # self.env.uid for ir.rule groups on menu diff --git a/addons/website/tests/test_performance.py b/addons/website/tests/test_performance.py index b42fa130148..9dcca13c472 100644 --- a/addons/website/tests/test_performance.py +++ b/addons/website/tests/test_performance.py @@ -113,7 +113,7 @@ class TestWebsitePerformance(UtilPerf): menu_bb.parent_id = menu_b menu_aa.parent_id = menu_a - self.assertEqual(self._get_url_hot_query(self.page.url), 22) + self.assertEqual(self._get_url_hot_query(self.page.url), 14) def test_50_perf_sql_web_content(self): # assets route /web/content/..