From 322d5768a785a790e86ae233bdbc2978042aacb8 Mon Sep 17 00:00:00 2001
From: qsm-odoo <qsm@odoo.com>
Date: Wed, 4 Dec 2019 10:55:24 +0000
Subject: [PATCH] [REF] website: call _post_copy with website in the context
directly
Before this commit, the website was given as a parameter of the
_post_copy function which is called after theme install. It was then
transfered through the context when calling the theme sub' post_copy
function.
It makes actually more sense to directly call the _post_copy function
with the right website in the context instead of a parameter. This will
also allow to call enable_view/disable_view in the default post_copy
common to all theme, with the right website.
closes odoo/odoo#41312
Signed-off-by: Romain Derie (rde) <rde@odoo.com>
---
addons/website/models/ir_module_module.py | 2 +-
addons/website/models/theme_models.py | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/addons/website/models/ir_module_module.py b/addons/website/models/ir_module_module.py
index d8609620dac8..1e8ec1fe5e9a 100644
--- a/addons/website/models/ir_module_module.py
+++ b/addons/website/models/ir_module_module.py
@@ -202,7 +202,7 @@ class IrModuleModule(models.Model):
for model_name in self._theme_model_names:
module._update_records(model_name, website)
- self.env['theme.utils']._post_copy(module, website)
+ self.env['theme.utils'].with_context(website_id=website.id)._post_copy(module)
def _theme_unload(self, website):
"""
diff --git a/addons/website/models/theme_models.py b/addons/website/models/theme_models.py
index 71fc63d5256a..e779a1eb5cd6 100644
--- a/addons/website/models/theme_models.py
+++ b/addons/website/models/theme_models.py
@@ -152,11 +152,7 @@ class Theme(models.AbstractModel):
_description = 'Theme Utils'
_auto = False
- def _post_copy(self, mod, website=False):
- # deprecated: to remove in master
- if not website: # remove optional website in master
- website = self.env['website'].get_current_website()
-
+ def _post_copy(self, mod):
# Reinitialize font customizations
self.env['web_editor.assets'].make_scss_customization(
'/website/static/src/scss/options/user_values.scss',
@@ -172,7 +168,7 @@ class Theme(models.AbstractModel):
theme_post_copy = '_%s_post_copy' % mod.name
if hasattr(self, theme_post_copy):
_logger.info('Executing method %s' % theme_post_copy)
- method = getattr(self.with_context(website_id=website.id), theme_post_copy)
+ method = getattr(self, theme_post_copy)
return method(mod)
return False
--
GitLab