Skip to content

Commit d53ae16

Browse files
duau-odooqsm-odoo
authored andcommitted
[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]: odoo/odoo@9fe45e2 opw-5020952 opw-5040694 closes #1132 Related: odoo/odoo#224076 Signed-off-by: Quentin Smetz (qsm) <[email protected]>
1 parent 59f35e4 commit d53ae16

File tree

6 files changed

+0
-16
lines changed

6 files changed

+0
-16
lines changed

theme_anelusia/static/src/scss/primary_variables.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes,
131131
)
132132
);
133133

134-
$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-25');
135-
136134
$o-color-palettes-compatibility-indexes: (
137135
1: 'anelusia-1',
138136
2: 'anelusia-2',

theme_avantgarde/static/src/scss/primary_variables.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,6 @@ $o-website-values-palettes: (
186186
),
187187
);
188188

189-
$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-15');
190-
191189
$o-color-palettes-compatibility-indexes: (
192190
1: 'avantgarde-1',
193191
2: 'avantgarde-2',

theme_bookstore/static/src/scss/primary_variables.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ $o-website-values-palettes: (
7474
),
7575
);
7676

77-
$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-26');
78-
7977
$o-color-palettes-compatibility-indexes: (
8078
1: 'bookstore-1',
8179
2: 'bookstore-2',

theme_buzzy/static/src/scss/primary_variables.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,6 @@ $o-website-values-palettes: (
3232
),
3333
);
3434

35-
//------------------------------------------------------------------------------
36-
// Palettes
37-
//------------------------------------------------------------------------------
38-
39-
$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-24');
40-
4135
//------------------------------------------------------------------------------
4236
// Fonts
4337
//------------------------------------------------------------------------------

theme_real_estate/static/src/scss/primary_variables.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ $o-website-values-palettes: (
9393
),
9494
);
9595

96-
$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-28');
97-
9896
$o-color-palettes-compatibility-indexes: (
9997
1: 'real-estate-1',
10098
2: 'real-estate-2',

theme_treehouse/static/src/scss/primary_variables.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,6 @@ $o-theme-color-palettes: map-merge($o-theme-color-palettes,
159159
)
160160
);
161161

162-
$o-selected-color-palettes-names: append($o-selected-color-palettes-names, 'default-28');
163-
164162
$o-color-palettes-compatibility-indexes: (
165163
1: 'treehouse-1',
166164
2: 'treehouse-2',

0 commit comments

Comments
 (0)