From 241453aaecfdd8e18aa3fe477cbc28c3f22601e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 21 Aug 2019 09:09:31 +0000
Subject: [PATCH] [MOV] website_mail: rename portal related files

PURPOSE

Fix frontend rating and clean a bit module organization

SPECIFICATIONS

In order to ease understanding of portal chatter dependencies let us name
files according to guidelines. In this commit we rename a bit files in
website mail to understand which widgets and portal parts are impacted by
website mail bridge module.

Assets are also moved in their own file to ease module discovering.

LINKS

Task 2057301
PR #35870
---
 addons/website_mail/__manifest__.py                    |  4 +---
 .../src/js/{website_mail.js => portal_chatter.js}      |  2 +-
 .../src/xml/{website_mail.xml => portal_chatter.xml}   |  0
 addons/website_mail/views/assets.xml                   | 10 ++++++++++
 addons/website_mail/views/website_mail_templates.xml   |  9 ---------
 5 files changed, 12 insertions(+), 13 deletions(-)
 rename addons/website_mail/static/src/js/{website_mail.js => portal_chatter.js} (81%)
 rename addons/website_mail/static/src/xml/{website_mail.xml => portal_chatter.xml} (100%)
 create mode 100644 addons/website_mail/views/assets.xml

diff --git a/addons/website_mail/__manifest__.py b/addons/website_mail/__manifest__.py
index a607382a998..fb4dc268da2 100644
--- a/addons/website_mail/__manifest__.py
+++ b/addons/website_mail/__manifest__.py
@@ -12,12 +12,10 @@ It is responsible of comments moderation for published documents (forum, slides,
 """,
     'depends': ['website', 'mail'],
     'data': [
+        'views/assets.xml',
         'views/website_mail_templates.xml',
         'security/website_mail_security.xml',
     ],
-    'qweb': [
-        'static/src/xml/website_mail.xml'
-    ],
     'installable': True,
     'auto_install': True,
 }
diff --git a/addons/website_mail/static/src/js/website_mail.js b/addons/website_mail/static/src/js/portal_chatter.js
similarity index 81%
rename from addons/website_mail/static/src/js/website_mail.js
rename to addons/website_mail/static/src/js/portal_chatter.js
index 473ed4b4128..923c17032fe 100644
--- a/addons/website_mail/static/src/js/website_mail.js
+++ b/addons/website_mail/static/src/js/portal_chatter.js
@@ -8,6 +8,6 @@ var portalChatter = require('portal.chatter');
  */
 portalChatter.PortalChatter.include({
     xmlDependencies: (portalChatter.PortalChatter.prototype.xmlDependencies || [])
-        .concat(['/website_mail/static/src/xml/website_mail.xml']),
+        .concat(['/website_mail/static/src/xml/portal_chatter.xml']),
 });
 });
diff --git a/addons/website_mail/static/src/xml/website_mail.xml b/addons/website_mail/static/src/xml/portal_chatter.xml
similarity index 100%
rename from addons/website_mail/static/src/xml/website_mail.xml
rename to addons/website_mail/static/src/xml/portal_chatter.xml
diff --git a/addons/website_mail/views/assets.xml b/addons/website_mail/views/assets.xml
new file mode 100644
index 00000000000..30d581cf4a4
--- /dev/null
+++ b/addons/website_mail/views/assets.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="head" inherit_id="website.assets_frontend" name="Mail customization">
+        <xpath expr="." position="inside">
+            <script type="text/javascript" src="/website_mail/static/src/js/follow.js"></script>
+            <script type="text/javascript" src="/website_mail/static/src/js/portal_chatter.js"></script>
+            <link rel="stylesheet" type="text/scss" href="/website_mail/static/src/css/website_mail.scss"/>
+        </xpath>
+    </template>
+</odoo>
diff --git a/addons/website_mail/views/website_mail_templates.xml b/addons/website_mail/views/website_mail_templates.xml
index cf13c79bc04..856af90ca93 100644
--- a/addons/website_mail/views/website_mail_templates.xml
+++ b/addons/website_mail/views/website_mail_templates.xml
@@ -16,13 +16,4 @@
             </div>
         </div>
     </template>
-
-    <template id="head" inherit_id="website.assets_frontend" name="Mail customization">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_mail/static/src/js/follow.js"></script>
-            <script type="text/javascript" src="/website_mail/static/src/js/website_mail.js"></script>
-            <link rel="stylesheet" type="text/scss" href="/website_mail/static/src/css/website_mail.scss"/>
-        </xpath>
-    </template>
-
 </odoo>