From 77b2b97f3dce3f0c926eddcd9823e0e86ef66480 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#539 Related: odoo/odoo#79783 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 ++-- .../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_common/models/theme_common.py | 14 +++++++------- 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 ++-- .../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 ++-- 16 files changed, 38 insertions(+), 27 deletions(-) diff --git a/theme_artists/models/theme_artists.py b/theme_artists/models/theme_artists.py index 2c8eb1af4..3166b037e 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('Ripple effect SCSS') + self.enable_asset('Ripple effect JS') diff --git a/theme_aviato/models/theme_aviato.py b/theme_aviato/models/theme_aviato.py index 16fe6326e..b126a11bb 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('Ripple effect SCSS') + self.enable_asset('Ripple effect JS') diff --git a/theme_bewise/models/theme_bewise.py b/theme_bewise/models/theme_bewise.py index 2d21474aa..38f237c63 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('Ripple effect SCSS') + self.enable_asset('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..c24228c71 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('Ripple effect SCSS') + self.enable_asset('Ripple effect JS') diff --git a/theme_buzzy/models/theme_buzzy.py b/theme_buzzy/models/theme_buzzy.py index 4331a2994..c07626052 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('Ripple effect SCSS') + self.enable_asset('Ripple effect JS') diff --git a/theme_cobalt/models/theme_cobalt.py b/theme_cobalt/models/theme_cobalt.py index ba8dba975..098fa63eb 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('Ripple effect SCSS') + self.enable_asset('Ripple effect JS') self.enable_header_off_canvas() diff --git a/theme_common/models/theme_common.py b/theme_common/models/theme_common.py index dcd956545..904c9a3e1 100644 --- a/theme_common/models/theme_common.py +++ b/theme_common/models/theme_common.py @@ -6,13 +6,13 @@ class ThemeCommon(models.AbstractModel): def _theme_common_post_copy(self, mod): # Reset all default color when switching themes - self.disable_asset('theme_common.option_colors_02_variables') - self.disable_asset('theme_common.option_colors_03_variables') - self.disable_asset('theme_common.option_colors_04_variables') - self.disable_asset('theme_common.option_colors_05_variables') - self.disable_asset('theme_common.option_colors_06_variables') - self.disable_asset('theme_common.option_colors_07_variables') - self.disable_asset('theme_common.option_colors_08_variables') + self.disable_asset('Option colors 02 variables SCSS') + self.disable_asset('Option colors 03 variables SCSS') + self.disable_asset('Option colors 04 variables SCSS') + self.disable_asset('Option colors 05 variables SCSS') + self.disable_asset('Option colors 06 variables SCSS') + self.disable_asset('Option colors 07 variables SCSS') + self.disable_asset('Option colors 08 variables SCSS') # For compatibility # self.enable_asset('theme_common.compatibility_saas_11_4_variables') diff --git a/theme_graphene/models/theme_graphene.py b/theme_graphene/models/theme_graphene.py index b5b7e8fe5..29f62b315 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('Ripple effect SCSS') + self.enable_asset('Ripple effect JS') diff --git a/theme_nano/models/theme_nano.py b/theme_nano/models/theme_nano.py index 575bb477a..3801871bc 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('Ripple effect SCSS') + self.enable_asset('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..7db6f6784 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('Ripple effect SCSS') + self.enable_asset('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..776089958 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('Ripple effect SCSS') + self.enable_asset('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..ca81f1af3 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('Ripple effect SCSS') + self.enable_asset('Ripple effect JS') diff --git a/theme_yes/models/theme_yes.py b/theme_yes/models/theme_yes.py index 1303eddef..b14f656d2 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('Ripple effect SCSS') + self.enable_asset('Ripple effect JS') diff --git a/theme_zap/models/theme_zap.py b/theme_zap/models/theme_zap.py index 74592560d..c9946ddb1 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('Ripple effect SCSS') + self.enable_asset('Ripple effect JS')