From 895e534eb2ddd3d74c5df8ed14f7b67b4c9af928 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Fri, 12 Mar 2021 15:36:57 +0000
Subject: [PATCH] [FIX] website_mail_channel: esc-raw the maze !

Purpose of this commit is to remove unnecessary t-raw. When dealing with
numbers (len of a list or an integer coming from controllers) we may use
t-esc instead.

LINKS

Task ID-2070632 (main task)
Task ID-2419762 (followup task)
COM PR odoo/odoo#62859
ENT PR odoo/enterprise#15172
UPG PR odoo/upgrade#2005
---
 .../views/website_mail_channel_templates.xml       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/addons/website_mail_channel/views/website_mail_channel_templates.xml b/addons/website_mail_channel/views/website_mail_channel_templates.xml
index fe88c9e9d7f..d0aaaa4cfaf 100644
--- a/addons/website_mail_channel/views/website_mail_channel_templates.xml
+++ b/addons/website_mail_channel/views/website_mail_channel_templates.xml
@@ -29,7 +29,7 @@
                 </div>
                 <div class="col-lg-2">
                     <i class='fa fa-fw fa-user' role="img" aria-label="Recipients" title="Recipients"/> <t t-esc="group_data[group.id]['members_count']"/> members<br />
-                    <i class='fa fa-fw fa-envelope-o' role="img" aria-label="Traffic" title="Traffic"/> <t t-raw="group_data[group.id]['monthly_message_nbr']"/> messages / month
+                    <i class='fa fa-fw fa-envelope-o' role="img" aria-label="Traffic" title="Traffic"/> <t t-esc="group_data[group.id]['monthly_message_nbr']"/> messages / month
                 </div>
                 <div class="col-lg-3">
                     <!--<t t-call="website_mail.follow"><t t-set="object" t-value="group"/></t>-->
@@ -204,10 +204,10 @@
                             <div>
                                 <p t-if="attachments" class="mt8">
                                     <a href="#" class="o_mg_link_hide">
-                                        <i class="fa fa-chevron-right" role="img" aria-label="Hide attachments" title="Hide attachments"/> <t t-raw="len(attachments)"/> attachments
+                                        <i class="fa fa-chevron-right" role="img" aria-label="Hide attachments" title="Hide attachments"/> <t t-esc="len(attachments)"/> attachments
                                     </a>
                                     <a href="#" class="o_mg_link_show">
-                                        <i class="fa fa-chevron-down" role="img" aria-label="Show attachments" title="Show attachments"/> <t t-raw="len(attachments)"/> attachments
+                                        <i class="fa fa-chevron-down" role="img" aria-label="Show attachments" title="Show attachments"/> <t t-esc="len(attachments)"/> attachments
                                     </a>
                                 </p>
                                 <div class="o_mg_link_content">
@@ -215,13 +215,13 @@
                                         <t t-if="attachment.access_token">
                                             <a t-attf-href="/web/content/#{attachment.id}?download=true&amp;access_token=#{attachment.access_token}" target="_blank">
                                                 <div class='oe_attachment_embedded o_image' t-att-title="attachment.name" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/100x80"/>
-                                                <div class='oe_attachment_name'><t t-raw='attachment.name' /></div>
+                                                <div class='oe_attachment_name'><t t-esc='attachment.name' /></div>
                                             </a>
                                         </t>
                                         <t t-else="">
                                             <a t-attf-href="/web/content/#{attachment.id}?download=true" target="_blank">
                                                 <div class='oe_attachment_embedded o_image' t-att-title="attachment.name" t-att-data-mimetype="attachment.mimetype" t-attf-data-src="/web/image/#{attachment.id}/100x80"/>
-                                                <div class='oe_attachment_name'><t t-raw='attachment.name' /></div>
+                                                <div class='oe_attachment_name'><t t-esc='attachment.name' /></div>
                                             </a>
                                         </t>
                                     </div>
@@ -273,10 +273,10 @@
                     </small>
                     <p t-if="thread.child_ids" class="mt8">
                         <a href="#" class="o_mg_link_hide">
-                            <i class="fa fa-chevron-right" role="img" aria-label="Hide replies" title="Hide replies"/> <t t-raw="len(thread.child_ids)"/> replies
+                            <i class="fa fa-chevron-right" role="img" aria-label="Hide replies" title="Hide replies"/> <t t-esc="len(thread.child_ids)"/> replies
                         </a>
                         <a href="#" class="o_mg_link_show">
-                            <i class="fa fa-chevron-down" role="img" aria-label="Show replies" title="Show replies"/> <t t-raw="len(thread.child_ids)"/> replies
+                            <i class="fa fa-chevron-down" role="img" aria-label="Show replies" title="Show replies"/> <t t-esc="len(thread.child_ids)"/> replies
                         </a>
                     </p>
                     <div class="o_mg_link_content o_mg_replies">