From ceef32500df5329a656c26d14e264e5c9c4b836e Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Thu, 23 Aug 2018 17:01:58 +0200 Subject: [FIX] website_theme_install: mode field in template.ir.ui.view are optionnal + remove duplicated arch --- addons/website_theme_install/models/ir_module_module.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/website_theme_install/models/ir_module_module.py') diff --git a/addons/website_theme_install/models/ir_module_module.py b/addons/website_theme_install/models/ir_module_module.py index d668d7be459..067f7e3a2f9 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'): -- cgit v1.2.3 From 2fb95cbfe57379b9a5e61622e729d664c3bf1fba Mon Sep 17 00:00:00 2001 From: Jeremy Kersten Date: Fri, 24 Aug 2018 23:32:00 +0200 Subject: [FIX] website_theme_install: uninstall current theme Before this commit we only remove upstream but not itself. --- addons/website_theme_install/models/ir_module_module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/website_theme_install/models/ir_module_module.py') diff --git a/addons/website_theme_install/models/ir_module_module.py b/addons/website_theme_install/models/ir_module_module.py index 067f7e3a2f9..f9ccc7b4bc7 100644 --- a/addons/website_theme_install/models/ir_module_module.py +++ b/addons/website_theme_install/models/ir_module_module.py @@ -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) -- cgit v1.2.3