NextERP/design-themes
2
0
Fork 0
mirror of https://github.com/odoo/design-themes.git synced 2025-10-07 01:18:52 +07:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] theme_*: fix the activation and deactivation of assets

Browse Source 
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: 77b2b97f3d
Related: odoo/odoo#81833
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
This commit is contained in:
Benjamin Vray
2021-12-09 15:00:40 +00:00
committed by qsm-odoo
parent bcb74695ed
commit b4e6d51f56
15 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme_artists/models/theme_artists.py
+2 -2
View File
@@ -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")
theme_aviato/models/theme_aviato.py
+3
View File
@@ -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")
theme_bewise/models/theme_bewise.py
+2 -2
View File
@@ -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")
theme_bewise/static/src/scss/primary_variables.scss
+1
View File
@@ -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,
),
);
theme_bistro/models/theme_bistro.py
+2 -2
View File
@@ -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")
theme_buzzy/models/theme_buzzy.py
+3
View File
@@ -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")
theme_cobalt/models/theme_cobalt.py
+2 -2
View File
@@ -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()
theme_graphene/models/theme_graphene.py
+2 -2
View File
@@ -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")
theme_nano/models/theme_nano.py
+2 -2
View File
@@ -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')
theme_paptic/models/theme_paptic.py
+2 -2
View File
@@ -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()
theme_real_estate/models/theme_real_estate.py
+2 -2
View File
@@ -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")
theme_real_estate/static/src/scss/primary_variables.scss
+1
View File
@@ -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,
),
);
theme_treehouse/models/theme_treehouse.py
+2 -2
View File
@@ -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")
theme_yes/models/theme_yes.py
+3
View File
@@ -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")
theme_zap/models/theme_zap.py
+2 -2
View File
@@ -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")