[MERGE] forward port branch saas-11.2 up to 42659dc70c2

1 files changed, 5 insertions, 1 deletions

diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index ba5b168c9b6..f8e00eb4494 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -119,6 +119,10 @@ class Website(models.Model):
             'arch': template_record.arch.replace(template, key),
             'name': name,
         })
+
+        if view.arch_fs:
+            view.arch_fs = False
+
         if ispage:
             page = self.env['website.page'].create({
                 'url': page_url,
@@ -711,7 +715,7 @@ class Page(models.Model):
                 'website_id': website.id,
             })
 
-        return True
+        return url
 
     @api.multi
     @api.returns('self', lambda value: value.id)