[FIX] theme_*: enable footer/header template correctly

See [1], `enable_view()` is now in charge of disabling the already possibly existing template header (and/or footer). Disabling `website.template_header_default` was not enough, any of the other template could have been selected by the user before updating the theme. Note that when installing a theme the first time on a website, the error won't occur as `_reset_default_config()` will be called through `_theme_remove()`. [1]: odoo/odoo#81181 Fixes odoo/upgrade#3048 task-2593407 opw-2680866 opw-2685951 opw-2685124 opw-2679040 closes odoo#548 X-original-commit: 9a289ea Related: odoo/odoo#81953 Signed-off-by: Romain Derie (rde) <rde@odoo.com>
adhoc-cicd · Dec 28, 2021 · cf5197e · cf5197e
1 parent b4e6d51
commit cf5197e
Show file tree

Hide file tree

Showing 28 changed files with 1 addition and 87 deletions.
diff --git a/theme_anelusia/models/theme_anelusia.py b/theme_anelusia/models/theme_anelusia.py
@@ -5,8 +5,4 @@ class ThemeAnelusia(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_anelusia_post_copy(self, mod):
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_headline')
-
-        # For compatibility
-        # self.enable_asset('theme_common.compatibility_saas_10_1')
diff --git a/theme_artists/models/theme_artists.py b/theme_artists/models/theme_artists.py
@@ -5,14 +5,9 @@ class ThemeArtists(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_artists_post_copy(self, mod):
-        # For compatibility
-        # self.enable_asset('theme_common.compatibility_saas_10_2')
-
-        self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_hamburger')
         self.enable_header_off_canvas()
 
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_centered')
 
         self.enable_asset("website.ripple_effect_scss")

diff --git a/theme_avantgarde/models/theme_avantgarde.py b/theme_avantgarde/models/theme_avantgarde.py
@@ -5,14 +5,9 @@ class ThemeAvantgarde(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_avantgarde_post_copy(self, mod):
-        # For compatibility
-        # self.enable_asset('theme_common.compatibility_saas_10_2')
-
-        self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_hamburger')
         self.enable_view('website.template_header_default_align_right')
         self.enable_view('website.template_header_hamburger_align_right')
 
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_descriptive')
 
diff --git a/theme_aviato/models/theme_aviato.py b/theme_aviato/models/theme_aviato.py
@@ -5,7 +5,6 @@ class ThemeAviato(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_aviato_post_copy(self, mod):
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_contact')
         self.enable_view('website.template_footer_slideout')
 

diff --git a/theme_beauty/models/theme_beauty.py b/theme_beauty/models/theme_beauty.py
@@ -5,7 +5,5 @@ class ThemeBeauty(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_beauty_post_copy(self, mod):
-        self.disable_view('website.template_header_default')
-
         self.enable_view('website.template_header_contact')
         self.enable_view('website.footer_custom')
diff --git a/theme_bewise/models/theme_bewise.py b/theme_bewise/models/theme_bewise.py
@@ -5,10 +5,6 @@ class ThemeBewise(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_bewise_post_copy(self, mod):
-        # For compatibility
-        # self.enable_asset('theme_common.compatibility_saas_10_2')
-
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_headline')
 
         self.enable_asset("website.ripple_effect_scss")

diff --git a/theme_bistro/models/theme_bistro.py b/theme_bistro/models/theme_bistro.py
@@ -5,14 +5,12 @@ class ThemeBistro(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_bistro_post_copy(self, mod):
-        self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_vertical')
         self.enable_view('website.template_header_default_align_right')
         self.enable_view('website.template_header_hamburger_align_right')
         self.enable_view('website.header_navbar_pills_style')
         self.enable_header_off_canvas()
 
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_centered')
         self.enable_view('website.template_footer_slideout')
         self.enable_view('website.option_footer_scrolltop')

diff --git a/theme_bookstore/models/theme_bookstore.py b/theme_bookstore/models/theme_bookstore.py
@@ -5,9 +5,6 @@ class ThemeBookstore(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_bookstore_post_copy(self, mod):
-        self.disable_view('website.template_header_default')
-        self.disable_view('website.footer_custom')
-
         self.enable_view('website.template_header_contact')
         self.enable_view('website.template_footer_links')
 
diff --git a/theme_buzzy/models/theme_buzzy.py b/theme_buzzy/models/theme_buzzy.py
@@ -5,7 +5,6 @@ class ThemeBuzzy(models.AbstractModel):
     _inherit = 'theme.utils'
 
     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")

diff --git a/theme_clean/models/theme_clean.py b/theme_clean/models/theme_clean.py
@@ -5,10 +5,8 @@ class ThemeClean(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_clean_post_copy(self, mod):
-        self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_hamburger')
         self.enable_view('website.template_header_hamburger_align_right')
         self.enable_header_off_canvas()
 
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_contact')
diff --git a/theme_cobalt/models/theme_cobalt.py b/theme_cobalt/models/theme_cobalt.py
@@ -5,9 +5,6 @@ class ThemeCobalt(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_cobalt_post_copy(self, mod):
-        # 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_header_off_canvas()
diff --git a/theme_common/models/theme_common.py b/theme_common/models/theme_common.py
@@ -13,7 +13,3 @@ def _theme_common_post_copy(self, mod):
         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')
-
-        # For compatibility
-        # self.enable_asset('theme_common.compatibility_saas_11_4_variables')
-        # self.enable_asset('theme_common.compatibility_saas_11_4')
diff --git a/theme_enark/models/theme_enark.py b/theme_enark/models/theme_enark.py
@@ -5,5 +5,4 @@ class ThemeEnark(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_enark_post_copy(self, mod):
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_descriptive')
diff --git a/theme_graphene/models/theme_graphene.py b/theme_graphene/models/theme_graphene.py
@@ -5,14 +5,9 @@ class ThemeGraphene(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_graphene_post_copy(self, mod):
-        # For compatibility
-        # self.enable_asset('theme_common.compatibility_saas_10_2')
-
-        self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_contact')
         self.enable_header_off_canvas()
 
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_centered')
 
         self.enable_asset("website.ripple_effect_scss")

diff --git a/theme_kea/models/theme_kea.py b/theme_kea/models/theme_kea.py
@@ -5,8 +5,4 @@ class ThemeKea(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_kea_post_copy(self, mod):
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_minimalist')
-
-        # For compatibility
-        # self.enable_asset('theme_common.compatibility_saas_10_1')
diff --git a/theme_kiddo/models/theme_kiddo.py b/theme_kiddo/models/theme_kiddo.py
@@ -6,9 +6,4 @@ class ThemeKiddo(models.AbstractModel):
 
     def _theme_kiddo_post_copy(self, mod):
         self.enable_view('website.template_header_default_align_right')
-
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_centered')
-
-        # For compatibility
-        # self.enable_asset('theme_common.compatibility_saas_10_1')
diff --git a/theme_loftspace/models/theme_loftspace.py b/theme_loftspace/models/theme_loftspace.py
@@ -5,9 +5,4 @@ class ThemeLoftspace(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_loftspace_post_copy(self, mod):
-        self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_centered_logo')
-
-        # For compatibility
-        # self.enable_asset('theme_common.compatibility_saas_10_1')
-        pass
diff --git a/theme_monglia/models/theme_monglia.py b/theme_monglia/models/theme_monglia.py
@@ -5,8 +5,4 @@ class ThemeMonglia(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_monglia_post_copy(self, mod):
-        # For compatibility
-        # self.enable_asset('theme_common.compatibility_saas_10_1')
-
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_minimalist')
diff --git a/theme_nano/models/theme_nano.py b/theme_nano/models/theme_nano.py
@@ -5,13 +5,10 @@ class ThemeNano(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_nano_post_copy(self, mod):
-        self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_centered_logo')
         self.enable_header_off_canvas()
         self.enable_view('website.header_navbar_pills_style')
 
-        self.disable_view('website.footer_custom')
-        self.disable_view('website.template_footer_contact')  # Old theme_treehouse dependency
         self.enable_view('website.template_footer_descriptive')
         self.enable_view('website.template_footer_slideout')
         self.enable_view('website.option_footer_scrolltop')

diff --git a/theme_notes/models/theme_notes.py b/theme_notes/models/theme_notes.py
@@ -6,9 +6,4 @@ class ThemeNotes(models.AbstractModel):
 
     def _theme_notes_post_copy(self, mod):
         self.enable_header_off_canvas()
-
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_descriptive')
-
-        # For compatibility
-        # self.enable_asset('theme_common.compatibility_saas_10_1')
diff --git a/theme_odoo_experts/models/theme_odoo_experts.py b/theme_odoo_experts/models/theme_odoo_experts.py
@@ -5,8 +5,5 @@ class ThemeOdooExperts(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_odoo_experts_post_copy(self, mod):
-        self.disable_view('website.template_header_default')
-        self.disable_view('website.footer_custom')
-
         self.enable_view('website.template_header_contact')
         self.enable_view('website.template_footer_contact')
diff --git a/theme_orchid/models/theme_orchid.py b/theme_orchid/models/theme_orchid.py
@@ -5,7 +5,5 @@ class ThemeOrchid(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_orchid_post_copy(self, mod):
-        self.disable_view('website.footer_custom')
-
         self.enable_view('website.template_header_default')
         self.enable_view('website.template_footer_descriptive')
diff --git a/theme_paptic/models/theme_paptic.py b/theme_paptic/models/theme_paptic.py
@@ -5,10 +5,8 @@ class ThemePaptic(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_paptic_post_copy(self, mod):
-        # 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_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
@@ -5,8 +5,5 @@ class ThemeRealEstate(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_real_estate_post_copy(self, mod):
-        # 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")
diff --git a/theme_treehouse/models/theme_treehouse.py b/theme_treehouse/models/theme_treehouse.py
@@ -8,7 +8,6 @@ def _theme_treehouse_post_copy(self, mod):
         self.disable_view('website.header_visibility_standard')
         self.enable_view('website.header_visibility_fixed')
 
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_contact')
         self.enable_view('website.template_footer_slideout')
         self.enable_view('website.option_footer_scrolltop')

diff --git a/theme_vehicle/models/theme_vehicle.py b/theme_vehicle/models/theme_vehicle.py
@@ -5,8 +5,4 @@ class ThemeVehicle(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_vehicle_post_copy(self, mod):
-        # For compatibility
-        # self.enable_asset('theme_common.compatibility_saas_10_1')
-
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_minimalist')
diff --git a/theme_yes/models/theme_yes.py b/theme_yes/models/theme_yes.py
@@ -5,7 +5,6 @@ class ThemeYes(models.AbstractModel):
     _inherit = 'theme.utils'
 
     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")

diff --git a/theme_zap/models/theme_zap.py b/theme_zap/models/theme_zap.py
@@ -5,11 +5,9 @@ class ThemeZap(models.AbstractModel):
     _inherit = 'theme.utils'
 
     def _theme_zap_post_copy(self, mod):
-        self.disable_view('website.template_header_default')
         self.enable_view('website.template_header_hamburger')
         self.enable_view('website.header_navbar_pills_style')
 
-        self.disable_view('website.footer_custom')
         self.enable_view('website.template_footer_links')
 
         self.enable_asset("website.ripple_effect_scss")