[MERGE] forward port branch saas-14 up to 6956ad54de5

1 files changed, 6 insertions, 1 deletions

diff --git a/addons/website/controllers/main.py b/addons/website/controllers/main.py
index 1159a7948a8..89c4365376a 100644
--- a/addons/website/controllers/main.py
+++ b/addons/website/controllers/main.py
@@ -313,9 +313,14 @@ class Website(Home):
 
     def get_view_ids(self, xml_ids):
         ids = []
+        View = request.env["ir.ui.view"].with_context(active_test=False)
         for xml_id in xml_ids:
             if "." in xml_id:
-                record_id = request.env.ref(xml_id).id
+                # Get website-specific view if possible
+                record_id = View.search([
+                    ("website_id", "=", request.website.id),
+                    ("key", "=", xml_id),
+                ]).id or request.env.ref(xml_id).id
             else:
                 record_id = int(xml_id)
             ids.append(record_id)