From b1414d3c30f5f35f89cbde0d65ca3cb5ddf04858 Mon Sep 17 00:00:00 2001
From: "Robin Lejeune (role)" <role@odoo.com>
Date: Tue, 31 Oct 2023 11:15:01 +0100
Subject: [PATCH] [FIX] website, website_sale: remove forced options views in
 headers

Since [this PR], some headers have some preselected options. For
instance, by default the header_sales_one displays social icons without
colors and a CTA button with rounded sides. However, if one modifies the
option in the panel, it appears to be working, but upon save it goes
back to no_icon_color / rounded sides.
This happens because the option is forced by the header template. That
behavior takes the precedence over the user's option choice.

As there is no proper way to make it work without modifying the model,
this commit removes the forced option on the templates for Odoo 17.
It should be properly reintroduced in master.

[this PR]: https://github.com/odoo/odoo/pull/119650

task-3576074

closes odoo/odoo#140669

Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
---
 addons/website/views/website_templates.xml | 49 +++++++++-------------
 addons/website_sale/views/templates.xml    |  4 +-
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 9e1a42867a3..db3d18c3375 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -355,7 +355,7 @@
                             <t t-set="_link_class" t-valuef="nav-link d-block p-1"/>
                         </t>
                         <!-- Social -->
-                        <t t-call="website.header_social_links_no_color">
+                        <t t-call="website.placeholder_header_social_links">
                             <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 o_border_contrast"/>
                         </t>
                     </ul>
@@ -398,7 +398,7 @@
     <xpath expr="//t[@t-call='website.placeholder_header_text_element']" position="inside">
         <t t-set="_div_class" t-valuef="align-items-center mt-2 border-top pt-2 text-center o_border_contrast"/>
     </xpath>
-    <xpath expr="//t[@t-call='website.header_social_links_no_color']" position="inside">
+    <xpath expr="//t[@t-call='website.placeholder_header_social_links']" position="inside">
         <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 text-center o_border_contrast"/>
     </xpath>
     <xpath expr="//t[@t-set='dropdown_toggler_classes']" position="attributes">
@@ -416,7 +416,7 @@
     <xpath expr="//t[@t-call='website.placeholder_header_text_element']" position="inside">
         <t t-set="_div_class" t-valuef="align-items-end mt-2 border-top pt-2 text-end o_border_contrast"/>
     </xpath>
-    <xpath expr="//t[@t-call='website.header_social_links_no_color']" position="inside">
+    <xpath expr="//t[@t-call='website.placeholder_header_social_links']" position="inside">
         <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 text-end o_border_contrast"/>
     </xpath>
     <xpath expr="//t[@t-set='dropdown_toggler_classes']" position="attributes">
@@ -567,7 +567,7 @@
                                 <t t-set="_link_class" t-valuef="nav-link d-block p-1"/>
                             </t>
                             <!-- Social -->
-                            <t t-call="website.header_social_links_no_color">
+                            <t t-call="website.placeholder_header_social_links">
                                 <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 o_border_contrast"/>
                             </t>
                         </ul>
@@ -616,7 +616,7 @@
     <xpath expr="//t[@t-call='website.placeholder_header_text_element']" position="inside">
         <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 text-center o_border_contrast"/>
     </xpath>
-    <xpath expr="//t[@t-call='website.header_social_links_no_color']" position="inside">
+    <xpath expr="//t[@t-call='website.placeholder_header_social_links']" position="inside">
         <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 text-center o_border_contrast"/>
     </xpath>
 </template>
@@ -628,7 +628,7 @@
     <xpath expr="//t[@t-call='website.placeholder_header_text_element']" position="inside">
         <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 text-end o_border_contrast"/>
     </xpath>
-    <xpath expr="//t[@t-call='website.header_social_links_no_color']" position="inside">
+    <xpath expr="//t[@t-call='website.placeholder_header_social_links']" position="inside">
         <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 text-end o_border_contrast"/>
     </xpath>
 </template>
@@ -671,7 +671,7 @@
                         <t t-set="_classes" t-valuef="h-100 border-start o_border_contrast"/>
                     </t>
                     <!-- Social -->
-                    <t t-call="website.header_social_links_no_color">
+                    <t t-call="website.placeholder_header_social_links">
                         <t t-set="_div_class" t-valuef="d-flex align-items-center h-100 border-start px-2 o_border_contrast"/>
                     </t>
                     <!-- Language Selector -->
@@ -767,7 +767,7 @@
                             <t t-set="_dropdown_menu_class" t-valuef="dropdown-menu-end"/>
                         </t>
                         <!-- Call To Action -->
-                        <t t-call="website.header_call_to_action_pill"/>
+                        <t t-call="website.placeholder_header_call_to_action"/>
                     </ul>
                 </div>
                 <div class="d-flex justify-content-center w-100">
@@ -854,7 +854,7 @@
                             <t t-set="_submit_classes" t-valuef="rounded-end-pill pe-3 bg-o-color-3"/>
                         </t>
                         <!-- Call To Action -->
-                        <t t-call="website.header_call_to_action_pill"/>
+                        <t t-call="website.placeholder_header_call_to_action"/>
                     </ul>
                 </div>
             </div>
@@ -921,7 +921,7 @@
                     </t>
                     <ul class="o_header_sales_one_right_col navbar-nav align-items-center gap-1 flex-grow-1 justify-content-end">
                         <!-- Call To Action -->
-                        <t t-call="website.header_call_to_action_pill">
+                        <t t-call="website.placeholder_header_call_to_action">
                             <t t-set="_item_class" t-valuef="flex-grow-1"/>
                             <t t-set="_div_class" t-valuef="d-flex align-items-center"/>
                         </t>
@@ -960,7 +960,7 @@
                             <t t-set="_item_class" t-valuef="flex-basis-0 flex-grow-1 flex-shrink-0"/>
                         </t>
                         <!-- Social -->
-                        <t t-call="website.header_social_links_no_color"/>
+                        <t t-call="website.placeholder_header_social_links"/>
                     </ul>
                 </div>
             </div>
@@ -1015,7 +1015,7 @@
                             <!-- Social -->
                             <!-- Return empty placeholder if the element is not active to keep the right layout -->
                             <li class="o_header_sales_two_social_links_placeholder" t-if="is_view_active('website.header_social_links') == False"/>
-                            <t t-call="website.header_social_links_no_color">
+                            <t t-call="website.placeholder_header_social_links">
                                 <t t-set="_div_class" t-valuef="d-flex align-items-center justify-content-end h-100"/>
                             </t>
                         </ul>
@@ -1103,7 +1103,7 @@
                     <div class="container d-flex justify-content-between gap-3 h-100">
                         <ul class="navbar-nav align-items-center gap-3 py-1">
                             <!-- Social -->
-                            <t t-call="website.header_social_links_no_color"/>
+                            <t t-call="website.placeholder_header_social_links"/>
                             <!-- Text element -->
                             <t t-call="website.placeholder_header_text_element">
                                 <t t-set="_txt_elt_content" t-valuef="list"/>
@@ -1205,7 +1205,7 @@
                             <t t-set="_item_class" t-valuef="position-relative"/>
                         </t>
                         <!-- Social -->
-                        <t t-call="website.header_social_links_no_color">
+                        <t t-call="website.placeholder_header_social_links">
                             <t t-set="_div_class" t-valuef="d-flex align-items-center"/>
                             <t t-set="_item_class" t-valuef="position-relative"/>
                         </t>
@@ -1251,7 +1251,7 @@
                             <li class="d-flex align-items-center gap-3 ms-auto mb-0">
                                 <ul class="navbar-nav gap-2">
                                     <!-- Call To Action -->
-                                    <t t-call="website.header_call_to_action_pill"/>
+                                    <t t-call="website.placeholder_header_call_to_action"/>
                                 </ul>
                             </li>
                         </ul>
@@ -1325,7 +1325,7 @@
                                 <t t-set="_txt_elt_content" t-valuef="phone_mail"/>
                             </t>
                             <!-- Social -->
-                            <t t-call="website.header_social_links_no_color">
+                            <t t-call="website.placeholder_header_social_links">
                                 <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 o_border_contrast"/>
                             </t>
                         </ul>
@@ -1373,7 +1373,7 @@
     <xpath expr="//t[@t-call='website.placeholder_header_text_element']" position="inside">
         <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 o_border_contrast text-center"/>
     </xpath>
-    <xpath expr="//t[@t-call='website.header_social_links_no_color']" position="inside">
+    <xpath expr="//t[@t-call='website.placeholder_header_social_links']" position="inside">
         <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 o_border_contrast text-center"/>
     </xpath>
     <xpath expr="//t[@t-set='dropdown_toggler_classes']" position="attributes">
@@ -1391,7 +1391,7 @@
     <xpath expr="//t[@t-call='website.placeholder_header_text_element']" position="inside">
         <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 o_border_contrast text-end"/>
     </xpath>
-    <xpath expr="//t[@t-call='website.header_social_links_no_color']" position="inside">
+    <xpath expr="//t[@t-call='website.placeholder_header_social_links']" position="inside">
         <t t-set="_div_class" t-valuef="mt-2 border-top pt-2 o_border_contrast text-end"/>
     </xpath>
     <xpath expr="//t[@t-set='dropdown_toggler_classes']" position="attributes">
@@ -1459,7 +1459,7 @@
                             <t t-set="_dropdown_menu_class" t-valuef="dropdown-menu-end"/>
                         </t>
                         <!-- Call To Action -->
-                        <t t-call="website.header_call_to_action_pill"/>
+                        <t t-call="website.placeholder_header_call_to_action"/>
                     </ul>
                 </div>
             </t>
@@ -2219,12 +2219,6 @@
     </xpath>
 </template>
 
-<template id="website.header_call_to_action_pill" inherit_id="website.header_call_to_action" name="Header Call to Action - Pill" primary="True">
-    <xpath expr="//a[hasclass('btn')]" position="attributes">
-        <attribute name="class" remove="btn-primary" add="btn-fill-primary rounded-circle" separator=" "/>
-    </xpath>
-</template>
-
 <template id="record_cover">
     <t t-set="_cp" t-value="_cp or json.loads(_record.cover_properties)"/>
     <t t-set="_name" t-value="_name or _record._name"/>
@@ -2854,11 +2848,6 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
         </li>
     </xpath>
 </template>
-<template id="website.header_social_links_no_color" inherit_id="website.header_social_links" name="Header Social Links - No Color" primary="True">
-    <xpath expr="//div[hasclass('s_social_media')]" position="attributes">
-        <attribute name="class" remove="" add="no_icon_color text-reset" separator=" "/>
-    </xpath>
-</template>
 
 <!--
     This template allows to use the website_search_box_input many times keeping
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index e1e0704e5e3..82d9fbc56c2 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -62,7 +62,7 @@
     </template>
 
     <template id="template_header_stretch" inherit_id="website.template_header_stretch">
-        <xpath expr="//t[@t-call='website.header_social_links_no_color']" position="before">
+        <xpath expr="//t[@t-call='website.placeholder_header_social_links']" position="before">
             <t t-call="website_sale.header_cart_link">
                 <t t-set="_icon" t-value="True"/>
                 <t t-set="_item_class" t-value="'border-start o_border_contrast'"/>
@@ -129,7 +129,7 @@
     </template>
 
     <template id="template_header_sales_four" inherit_id="website.template_header_sales_four">
-        <xpath expr="//t[@t-call='website.header_call_to_action_pill']" position="before">
+        <xpath expr="//t[@t-call='website.placeholder_header_call_to_action']" position="before">
             <t t-call="website_sale.header_cart_link">
                 <t t-set="_icon" t-value="True"/>
                 <t t-set="_link_class" t-value="'o_navlink_background_hover btn position-relative rounded-pill p-1 text-reset'"/>