From 667a00a02972b277e6ec5f69ecd920dd54fec739 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Mottet=20=28oms=29?= Date: Mon, 11 Oct 2021 14:08:39 +0000 Subject: [PATCH] [FIX] website: use base-1 as default palette for configurator When using the configurator the user can upload its logo to generate a color palette. In this case we select the base-1 palette as default palette instead of the theme's default palette. Doing so avoids the potential customizations the theme palette may introduces. task-2665885 closes odoo/odoo#78251 X-original-commit: 50019c8f68b89968615f87c365095c94caeef46c Signed-off-by: Quentin Smetz (qsm) --- addons/website/models/website.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/website/models/website.py b/addons/website/models/website.py index ff8c533065c..e9984da40c8 100644 --- a/addons/website/models/website.py +++ b/addons/website/models/website.py @@ -357,13 +357,15 @@ class Website(models.Model): @api.model def configurator_apply(self, **kwargs): def set_colors(selected_palette): + url = '/website/static/src/scss/options/user_values.scss' + selected_palette_name = selected_palette if isinstance(selected_palette, str) else 'base-1' + values = {'color-palettes-name': "'%s'" % selected_palette_name} + self.env['web_editor.assets'].make_scss_customization(url, values) + if isinstance(selected_palette, list): url = '/website/static/src/scss/options/colors/user_color_palette.scss' values = {f'o-color-{i}': color for i, color in enumerate(selected_palette, 1)} - else: - url = '/website/static/src/scss/options/user_values.scss' - values = {'color-palettes-name': "'%s'" % selected_palette} - self.env['web_editor.assets'].make_scss_customization(url, values) + self.env['web_editor.assets'].make_scss_customization(url, values) def set_features(selected_features): features = self.env['website.configurator.feature'].browse(selected_features)