From ebe86f5ca560163338347f20750e2089d3c36f2c Mon Sep 17 00:00:00 2001
From: Julien Mougenot <jum@odoo.com>
Date: Tue, 9 Feb 2021 14:31:51 +0100
Subject: [PATCH] [REF] web,*: Flatten _assets_helpers

Before this commit, the asset bundle "_assets_helpers" was the only
bundle using a "t-raw" directive to insert assets in between other asset
calls.

Now _assets_helpers only contains the assets called before the t-raw
directive, and the second part (1 file actually) has been added after
every call of the bundle.

This has been done to improve consistency in asset bundles declarations
by reducing them to the simplest possible templates.

Part of task: 2352566

Co-authored-by: Julien Mougenot <jum@odoo.com>
Co-authored-by: Simon Genin <ges@odoo.com>
---
 .../views/im_livechat_channel_templates.xml     |  1 +
 addons/mass_mailing/views/assets.xml            |  1 +
 addons/snailmail/views/report_assets.xml        |  1 +
 addons/survey/views/assets.xml                  |  6 +++---
 addons/web/views/report_templates.xml           |  6 +++---
 addons/web/views/webclient_templates.xml        | 17 +++++++----------
 addons/web_editor/views/editor.xml              |  6 +++---
 addons/website/views/assets.xml                 |  7 ++++---
 addons/website_slides/views/assets.xml          |  1 +
 9 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/addons/im_livechat/views/im_livechat_channel_templates.xml b/addons/im_livechat/views/im_livechat_channel_templates.xml
index da4a0a628dd..35f81330259 100644
--- a/addons/im_livechat/views/im_livechat_channel_templates.xml
+++ b/addons/im_livechat/views/im_livechat_channel_templates.xml
@@ -186,6 +186,7 @@
             <script type="text/javascript" src="/mail/static/src/js/utils.js"></script>
             <script type="text/javascript" src="/im_livechat/static/src/legacy/public_livechat.js"></script>
             <t t-call="web._assets_helpers"/>
+            <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
             <link rel="stylesheet" type="text/scss" href="/im_livechat/static/src/scss/im_livechat_bootstrap.scss"/>
             <link rel="stylesheet" type="text/scss" href="/im_livechat/static/src/legacy/public_livechat.scss"/>
         </template>
diff --git a/addons/mass_mailing/views/assets.xml b/addons/mass_mailing/views/assets.xml
index 0813648b6cd..96dc4fcc101 100644
--- a/addons/mass_mailing/views/assets.xml
+++ b/addons/mass_mailing/views/assets.xml
@@ -22,6 +22,7 @@
 
     <template id="assets_mail_themes_edition"> <!-- maybe to remove and convert into a field dumy with attr invisible if the template is not selected -->
         <t t-call="web._assets_helpers"/>
+        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
         <link rel="stylesheet" type="text/scss" href="/mass_mailing/static/src/scss/mass_mailing.ui.scss"/>
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/webclient.scss"/>
     </template>
diff --git a/addons/snailmail/views/report_assets.xml b/addons/snailmail/views/report_assets.xml
index 20c2d2c1369..f5715abd2bf 100644
--- a/addons/snailmail/views/report_assets.xml
+++ b/addons/snailmail/views/report_assets.xml
@@ -2,6 +2,7 @@
 <odoo>
     <template id="report_assets_snailmail">
         <t t-call="web._assets_helpers"/>
+        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
         <link rel="stylesheet" type="text/scss" href="/snailmail/static/src/scss/snailmail_external_layout_asset.scss"/>
         <script type="text/javascript" src="/snailmail/static/src/js/snailmail_external_layout.js"/>
     </template>
diff --git a/addons/survey/views/assets.xml b/addons/survey/views/assets.xml
index a05c8f9340e..664fa801b57 100644
--- a/addons/survey/views/assets.xml
+++ b/addons/survey/views/assets.xml
@@ -14,9 +14,9 @@
         <script type="text/javascript" src="/survey/static/src/js/survey_print.js" />
         <script type="text/javascript" src="/survey/static/src/js/survey_result.js" />
 
-        <t t-call="web._assets_helpers">
-            <t t-call="web._assets_frontend_helpers"/>
-        </t>
+        <t t-call="web._assets_helpers"/>
+        <t t-call="web._assets_frontend_helpers"/>
+        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
         <link href="/survey/static/src/css/survey_print.css" rel="stylesheet" type="text/css"/>
         <link href="/survey/static/src/css/survey_result.css" rel="stylesheet" type="text/css"></link>
         <link rel="stylesheet" type="text/scss" href="/survey/static/src/scss/survey_form.scss"/>
diff --git a/addons/web/views/report_templates.xml b/addons/web/views/report_templates.xml
index 573d1f1a161..1dc19a75ee3 100644
--- a/addons/web/views/report_templates.xml
+++ b/addons/web/views/report_templates.xml
@@ -3,9 +3,9 @@
     <!-- Assets for reports -->
 
     <template id="report_assets_common">
-        <t t-call="web._assets_helpers">
-          <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/bootstrap_overridden_report.scss"/>
-        </t>
+        <t t-call="web._assets_helpers"/>
+        <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/bootstrap_overridden_report.scss"/>
+        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
 
         <t t-call="web._assets_bootstrap"/>
 
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 7ee7c5877d7..ba9a28de7b2 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -21,10 +21,6 @@
         <t t-call="web._assets_utils"/>
         <t t-call="web._assets_primary_variables"/>
         <t t-call="web._assets_secondary_variables"/>
-
-        <t t-raw="0"/>
-
-        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
     </template>
 
     <template id="_assets_backend_helpers">
@@ -55,6 +51,7 @@
 
     <template id="assets_common" name="Common Assets (used in backend interface and website)">
         <t t-call="web._assets_helpers"/>
+        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
 
         <link rel="stylesheet" type="text/css" href="/web/static/lib/jquery.ui/jquery-ui.css"/>
         <link rel="stylesheet" type="text/css" href="/web/static/lib/fontawesome/css/font-awesome.css"/>
@@ -187,9 +184,9 @@
     </template>
 
     <template id="assets_backend" name="Backend Assets (used in backend interface)">
-        <t t-call="web._assets_helpers">
-            <t t-call="web._assets_backend_helpers"/>
-        </t>
+        <t t-call="web._assets_helpers"/>
+        <t t-call="web._assets_backend_helpers"/>
+        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
 
         <t t-call="web._assets_bootstrap"/>
 
@@ -408,9 +405,9 @@
     </template>
 
     <template id="assets_frontend" name="Website Assets">
-        <t t-call="web._assets_helpers">
-            <t t-call="web._assets_frontend_helpers"/>
-        </t>
+        <t t-call="web._assets_helpers"/>
+        <t t-call="web._assets_frontend_helpers"/>
+        <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
 
         <t t-call="web._assets_bootstrap"/>
         <link rel="stylesheet" type="text/scss" href="/web/static/src/scss/base_frontend.scss"/>
diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml
index 207dddfa4cb..7b9e2ea258d 100644
--- a/addons/web_editor/views/editor.xml
+++ b/addons/web_editor/views/editor.xml
@@ -25,9 +25,9 @@
 
     <!-- odoo utils -->
 
-    <t t-call="web._assets_helpers">
-        <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden.scss"/>
-    </t>
+    <t t-call="web._assets_helpers"/>
+    <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden.scss"/>
+    <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
 
     <!-- integration -->
 
diff --git a/addons/website/views/assets.xml b/addons/website/views/assets.xml
index a5dbcd863e9..48925966575 100644
--- a/addons/website/views/assets.xml
+++ b/addons/website/views/assets.xml
@@ -117,9 +117,9 @@
 </template>
 
 <template id="website.assets_wysiwyg" name="Website Editor Assets (used in website editor)">
-    <t t-call="web._assets_helpers">
-        <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden.scss"/>
-    </t>
+    <t t-call="web._assets_helpers"/>
+    <link rel="stylesheet" type="text/scss" href="/web_editor/static/src/scss/bootstrap_overridden.scss"/>
+    <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
     <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website.wysiwyg.scss"/>
     <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website.edit_mode.scss"/>
 
@@ -155,6 +155,7 @@
 
 <template id="website.assets_editor" name="Website Editor Assets (used in website editor)">
     <t t-call="web._assets_helpers"/>
+    <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
 
     <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website.editor.ui.scss"/>
     <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/website.theme_install.scss"/>
diff --git a/addons/website_slides/views/assets.xml b/addons/website_slides/views/assets.xml
index 266cee25683..cad85aebadc 100644
--- a/addons/website_slides/views/assets.xml
+++ b/addons/website_slides/views/assets.xml
@@ -58,6 +58,7 @@
         <!-- Bundle (minimal) for embedded slide iframe -->
         <template id="website_slides.slide_embed_assets" name="Website slides embed assets">
             <t t-call="web._assets_helpers"/>
+            <link rel="stylesheet" type="text/scss" href="/web/static/lib/bootstrap/scss/_variables.scss"/>
             <t t-call="web._assets_bootstrap"/>
             <link rel="stylesheet" type="text/scss" href="/website_slides/static/src/scss/website_slides.scss" t-ignore="true"/>