From fee5fc75fe86728e4ffa96a4d8f7db863bad5d05 Mon Sep 17 00:00:00 2001 From: "Augustin (duau)" Date: Wed, 20 Aug 2025 15:57:54 +0000 Subject: [PATCH] [FIX] *: fix duplicate palette crashing render in theme tab *: theme_anelusia, theme_avantgarde, theme_bookstore, theme_buzzy, theme_real_estate, theme_treehouse Since website refactor [1], a silent error would occur while rendering the theme tab, because of the use of `t-foreach`, leading to nothing being displayed depending of the theme. This was caused by a duplicate key in the `$o-selected-color-palettes-names` scss variable, added by some theme, which would make the `t-foreach` crash in `website.ThemeColorsOption`. Steps to reproduce: - Create a website using any of the above themes, through the wizard - Enter edit mode - Click on theme tab - Nothing is rendered [1]: https://github.com/odoo/odoo/commit/9fe45e2b7ddbbfd0445ffe25a859e67a316d02b2 opw-5020952 opw-5040694 closes odoo/design-themes#1141 X-original-commit: d53ae16a85ce34b2ba00a412b01554ebafef9774 Related: odoo/odoo#225809 Signed-off-by: Quentin Smetz (qsm) Signed-off-by: Augustin Dupin (duau) --- theme_anelusia/static/src/scss/primary_variables.scss | 2 -- theme_avantgarde/static/src/scss/primary_variables.scss | 2 -- theme_bookstore/static/src/scss/primary_variables.scss | 2 -- theme_buzzy/static/src/scss/primary_variables.scss | 6 ------ theme_real_estate/static/src/scss/primary_variables.scss | 2 -- theme_treehouse/static/src/scss/primary_variables.scss | 2 -- 6 files changed, 16 deletions(-) diff --git a/theme_anelusia/static/src/scss/primary_variables.scss b/theme_anelusia/static/src/scss/primary_variables.scss index 944b90793..39aec6ccc 100644 --- a/theme_anelusia/static/src/scss/primary_variables.scss +++ b/theme_anelusia/static/src/scss/primary_variables.scss @@ -131,8 +131,6 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, ) ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-25'); - $o-color-palettes-compatibility-indexes: ( 1: 'anelusia-1', 2: 'anelusia-2', diff --git a/theme_avantgarde/static/src/scss/primary_variables.scss b/theme_avantgarde/static/src/scss/primary_variables.scss index 9872f787b..615a5d1bf 100644 --- a/theme_avantgarde/static/src/scss/primary_variables.scss +++ b/theme_avantgarde/static/src/scss/primary_variables.scss @@ -186,8 +186,6 @@ $o-website-values-palettes: ( ), ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-15'); - $o-color-palettes-compatibility-indexes: ( 1: 'avantgarde-1', 2: 'avantgarde-2', diff --git a/theme_bookstore/static/src/scss/primary_variables.scss b/theme_bookstore/static/src/scss/primary_variables.scss index c3cb2a14e..ac17a222c 100644 --- a/theme_bookstore/static/src/scss/primary_variables.scss +++ b/theme_bookstore/static/src/scss/primary_variables.scss @@ -74,8 +74,6 @@ $o-website-values-palettes: ( ), ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-26'); - $o-color-palettes-compatibility-indexes: ( 1: 'bookstore-1', 2: 'bookstore-2', diff --git a/theme_buzzy/static/src/scss/primary_variables.scss b/theme_buzzy/static/src/scss/primary_variables.scss index e8d72bce5..5b6e1ab12 100644 --- a/theme_buzzy/static/src/scss/primary_variables.scss +++ b/theme_buzzy/static/src/scss/primary_variables.scss @@ -32,12 +32,6 @@ $o-website-values-palettes: ( ), ); -//------------------------------------------------------------------------------ -// Palettes -//------------------------------------------------------------------------------ - -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-24'); - //------------------------------------------------------------------------------ // Fonts //------------------------------------------------------------------------------ diff --git a/theme_real_estate/static/src/scss/primary_variables.scss b/theme_real_estate/static/src/scss/primary_variables.scss index 7c814fdc5..b357b80e0 100644 --- a/theme_real_estate/static/src/scss/primary_variables.scss +++ b/theme_real_estate/static/src/scss/primary_variables.scss @@ -93,8 +93,6 @@ $o-website-values-palettes: ( ), ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-28'); - $o-color-palettes-compatibility-indexes: ( 1: 'real-estate-1', 2: 'real-estate-2', diff --git a/theme_treehouse/static/src/scss/primary_variables.scss b/theme_treehouse/static/src/scss/primary_variables.scss index 7c1328f53..899a130f5 100644 --- a/theme_treehouse/static/src/scss/primary_variables.scss +++ b/theme_treehouse/static/src/scss/primary_variables.scss @@ -159,8 +159,6 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes, ) ); -$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-28'); - $o-color-palettes-compatibility-indexes: ( 1: 'treehouse-1', 2: 'treehouse-2',