From b4e6d51f567f0d14d54519ff5d32f409f828895c Mon Sep 17 00:00:00 2001 From: Benjamin Vray Date: Thu, 9 Dec 2021 15:00:40 +0000 Subject: [PATCH] [FIX] theme_*: fix the activation and deactivation of assets Before this commit: - The assets were not enabled or disabled when installing themes because we searched for assets with the "key" field instead of the "name" field. - The "Ripple Effect" was not correctly installed on several themes. Because the variable and the assets were not both activated. Even if the variable is not used, it is still necessary for the proper functioning of the option (e.g. _computeWidgetState). task-2686370 closes odoo/design-themes#546 X-original-commit: 77b2b97f3dce3f0c926eddcd9823e0e86ef66480 Related: odoo/odoo#81833 Signed-off-by: Quentin Smetz (qsm) --- theme_artists/models/theme_artists.py | 4 ++-- theme_aviato/models/theme_aviato.py | 3 +++ theme_bewise/models/theme_bewise.py | 4 ++-- theme_bewise/static/src/scss/primary_variables.scss | 1 + theme_bistro/models/theme_bistro.py | 4 ++-- theme_buzzy/models/theme_buzzy.py | 3 +++ theme_cobalt/models/theme_cobalt.py | 4 ++-- theme_graphene/models/theme_graphene.py | 4 ++-- theme_nano/models/theme_nano.py | 4 ++-- theme_paptic/models/theme_paptic.py | 4 ++-- theme_real_estate/models/theme_real_estate.py | 4 ++-- theme_real_estate/static/src/scss/primary_variables.scss | 1 + theme_treehouse/models/theme_treehouse.py | 4 ++-- theme_yes/models/theme_yes.py | 3 +++ theme_zap/models/theme_zap.py | 4 ++-- 15 files changed, 31 insertions(+), 20 deletions(-) diff --git a/theme_artists/models/theme_artists.py b/theme_artists/models/theme_artists.py index 2c8eb1af4..0e0d202d0 100644 --- a/theme_artists/models/theme_artists.py +++ b/theme_artists/models/theme_artists.py @@ -15,5 +15,5 @@ class ThemeArtists(models.AbstractModel): self.disable_view('website.footer_custom') self.enable_view('website.template_footer_centered') - self.enable_asset('website.ripple_effect_scss') - self.enable_asset('website.ripple_effect_js') + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js") diff --git a/theme_aviato/models/theme_aviato.py b/theme_aviato/models/theme_aviato.py index 16fe6326e..bfe121cfd 100644 --- a/theme_aviato/models/theme_aviato.py +++ b/theme_aviato/models/theme_aviato.py @@ -8,3 +8,6 @@ class ThemeAviato(models.AbstractModel): self.disable_view('website.footer_custom') self.enable_view('website.template_footer_contact') self.enable_view('website.template_footer_slideout') + + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js") diff --git a/theme_bewise/models/theme_bewise.py b/theme_bewise/models/theme_bewise.py index 2d21474aa..366196445 100644 --- a/theme_bewise/models/theme_bewise.py +++ b/theme_bewise/models/theme_bewise.py @@ -11,5 +11,5 @@ class ThemeBewise(models.AbstractModel): self.disable_view('website.footer_custom') self.enable_view('website.template_footer_headline') - self.enable_asset('website.ripple_effect_scss') - self.enable_asset('website.ripple_effect_js') + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js") diff --git a/theme_bewise/static/src/scss/primary_variables.scss b/theme_bewise/static/src/scss/primary_variables.scss index 4edd2c1c5..b1fdb68b5 100644 --- a/theme_bewise/static/src/scss/primary_variables.scss +++ b/theme_bewise/static/src/scss/primary_variables.scss @@ -117,6 +117,7 @@ $o-website-values-palettes: ( 'btn-font-size-lg': 1.65rem, 'btn-padding-y-lg': .5rem, 'btn-padding-x-lg': 2.5rem, + 'btn-ripple': true, ), ); diff --git a/theme_bistro/models/theme_bistro.py b/theme_bistro/models/theme_bistro.py index 4fbeef902..9fa14ab08 100644 --- a/theme_bistro/models/theme_bistro.py +++ b/theme_bistro/models/theme_bistro.py @@ -17,5 +17,5 @@ class ThemeBistro(models.AbstractModel): self.enable_view('website.template_footer_slideout') self.enable_view('website.option_footer_scrolltop') - self.enable_asset('website.ripple_effect_scss') - self.enable_asset('website.ripple_effect_js') + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js") diff --git a/theme_buzzy/models/theme_buzzy.py b/theme_buzzy/models/theme_buzzy.py index 4331a2994..ff6c8293a 100644 --- a/theme_buzzy/models/theme_buzzy.py +++ b/theme_buzzy/models/theme_buzzy.py @@ -7,3 +7,6 @@ class ThemeBuzzy(models.AbstractModel): def _theme_buzzy_post_copy(self, mod): self.disable_view('website.footer_custom') self.enable_view('website.template_footer_minimalist') + + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js") diff --git a/theme_cobalt/models/theme_cobalt.py b/theme_cobalt/models/theme_cobalt.py index ba8dba975..5aa07f28c 100644 --- a/theme_cobalt/models/theme_cobalt.py +++ b/theme_cobalt/models/theme_cobalt.py @@ -8,6 +8,6 @@ class ThemeCobalt(models.AbstractModel): # For compatibility # self.enable_asset('theme_common.compatibility_saas_10_2') - self.enable_asset('website.ripple_effect_scss') - self.enable_asset('website.ripple_effect_js') + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js") self.enable_header_off_canvas() diff --git a/theme_graphene/models/theme_graphene.py b/theme_graphene/models/theme_graphene.py index b5b7e8fe5..53dfc4993 100644 --- a/theme_graphene/models/theme_graphene.py +++ b/theme_graphene/models/theme_graphene.py @@ -15,5 +15,5 @@ class ThemeGraphene(models.AbstractModel): self.disable_view('website.footer_custom') self.enable_view('website.template_footer_centered') - self.enable_asset('website.ripple_effect_scss') - self.enable_asset('website.ripple_effect_js') + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js") diff --git a/theme_nano/models/theme_nano.py b/theme_nano/models/theme_nano.py index 575bb477a..be7703769 100644 --- a/theme_nano/models/theme_nano.py +++ b/theme_nano/models/theme_nano.py @@ -16,7 +16,7 @@ class ThemeNano(models.AbstractModel): self.enable_view('website.template_footer_slideout') self.enable_view('website.option_footer_scrolltop') - self.enable_asset('website.ripple_effect_scss') - self.enable_asset('website.ripple_effect_js') + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js") self.disable_view('portal.footer_language_selector') diff --git a/theme_paptic/models/theme_paptic.py b/theme_paptic/models/theme_paptic.py index 6635b0ae0..785fa38bc 100644 --- a/theme_paptic/models/theme_paptic.py +++ b/theme_paptic/models/theme_paptic.py @@ -8,7 +8,7 @@ class ThemePaptic(models.AbstractModel): # For compatibility # self.enable_asset('theme_common.compatibility_saas_10_2') - self.enable_asset('website.ripple_effect_scss') - self.enable_asset('website.ripple_effect_js') + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js") self.enable_view('website.template_footer_centered') self.enable_header_off_canvas() diff --git a/theme_real_estate/models/theme_real_estate.py b/theme_real_estate/models/theme_real_estate.py index e859e3934..efadd4b3e 100644 --- a/theme_real_estate/models/theme_real_estate.py +++ b/theme_real_estate/models/theme_real_estate.py @@ -8,5 +8,5 @@ class ThemeRealEstate(models.AbstractModel): # For compatibility # self.enable_asset('theme_common.compatibility_saas_10_2') - self.enable_asset('website.ripple_effect_scss') - self.enable_asset('website.ripple_effect_js') + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js") diff --git a/theme_real_estate/static/src/scss/primary_variables.scss b/theme_real_estate/static/src/scss/primary_variables.scss index f73287161..9936d2c72 100644 --- a/theme_real_estate/static/src/scss/primary_variables.scss +++ b/theme_real_estate/static/src/scss/primary_variables.scss @@ -98,6 +98,7 @@ $o-website-values-palettes: ( 'btn-border-radius': 0px, 'btn-border-radius-sm': 0px, 'btn-border-radius-lg': 0px, + 'btn-ripple': true, ), ); diff --git a/theme_treehouse/models/theme_treehouse.py b/theme_treehouse/models/theme_treehouse.py index 0226e1dea..e7e805213 100644 --- a/theme_treehouse/models/theme_treehouse.py +++ b/theme_treehouse/models/theme_treehouse.py @@ -13,5 +13,5 @@ class ThemeTreehouse(models.AbstractModel): self.enable_view('website.template_footer_slideout') self.enable_view('website.option_footer_scrolltop') - self.enable_asset('website.ripple_effect_scss') - self.enable_asset('website.ripple_effect_js') + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js") diff --git a/theme_yes/models/theme_yes.py b/theme_yes/models/theme_yes.py index 1303eddef..791151307 100644 --- a/theme_yes/models/theme_yes.py +++ b/theme_yes/models/theme_yes.py @@ -7,3 +7,6 @@ class ThemeYes(models.AbstractModel): def _theme_yes_post_copy(self, mod): self.disable_view('website.footer_custom') self.enable_view('website.template_footer_descriptive') + + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js") diff --git a/theme_zap/models/theme_zap.py b/theme_zap/models/theme_zap.py index 74592560d..9f7fb2d00 100644 --- a/theme_zap/models/theme_zap.py +++ b/theme_zap/models/theme_zap.py @@ -12,5 +12,5 @@ class ThemeZap(models.AbstractModel): self.disable_view('website.footer_custom') self.enable_view('website.template_footer_links') - self.enable_asset('website.ripple_effect_scss') - self.enable_asset('website.ripple_effect_js') + self.enable_asset("website.ripple_effect_scss") + self.enable_asset("website.ripple_effect_js")