[MERGE] forward port branch saas-11.5 up to 40430699dfb

2 files changed, 3 insertions, 11 deletions

diff --git a/addons/website_theme_install/models/ir_module_module.py b/addons/website_theme_install/models/ir_module_module.py
index d668d7be459..f9ccc7b4bc7 100644
--- a/addons/website_theme_install/models/ir_module_module.py
+++ b/addons/website_theme_install/models/ir_module_module.py
@@ -70,15 +70,15 @@ class IrModuleModule(models.Model):
                 'name': view.name,
                 'arch': view.arch,
                 'key': view.key,
-                'arch': view.arch,
                 'arch_fs': view.arch_fs,
                 'priority': view.priority,
-                'mode': view.mode,
                 'active': view.active,
                 'inherit_id': view.inherit_id and view.inherit_id.id,
                 'theme_template_id': view.id,
                 'website_id': website.id,
             }
+            if view.mode:  # if not provided, computed automatically (if inherit_id or not)
+                new_view['mode'] = view.mode
             loaded['views'] += self.env['ir.ui.view'].create(new_view)
 
         for page in self._get_module_data('theme.website.page'):
@@ -126,7 +126,7 @@ class IrModuleModule(models.Model):
             views_todel.unlink()
 
     def _remove_theme_on_website(self, website):
-        installed_deps = website.theme_id.upstream_dependencies(exclude_states=('',)).filtered(lambda x: x.name.startswith('theme_'))
+        installed_deps = self + website.theme_id.upstream_dependencies(exclude_states=('',)).filtered(lambda x: x.name.startswith('theme_'))
         for mod in installed_deps:
             mod._unload_one_theme_module(website)
 
diff --git a/addons/website_theme_install/models/website.py b/addons/website_theme_install/models/website.py
index 46ee9df91e2..6bf339362b5 100644
--- a/addons/website_theme_install/models/website.py
+++ b/addons/website_theme_install/models/website.py
@@ -15,11 +15,3 @@ class Website(models.Model):
             'url': '/web#action=website_theme_install.theme_install_kanban_action',
             'target': 'self',
         }
-
-    def button_go_website(self):
-        self._force()
-        return {
-            'type': 'ir.actions.act_url',
-            'url': '/',
-            'target': 'self',
-        }