From 57d51a40507feda9521a3d23b6c6d5ba93d43660 Mon Sep 17 00:00:00 2001
From: ryv-odoo <ryv@odoo.com>
Date: Mon, 5 Aug 2019 08:55:05 +0000
Subject: [PATCH 1/6] [FIX] website_rating: correctly take into account rating
 ratio in frontend

PURPOSE

Fix frontend rating and clean a bit module organization

SPECIFICATIONS

Currently when updating a review on slides, the rating value is divided
by 2 on each update as the rating ratio is not taken into account. In this
commit we correctly update the hidden input value during the start function
using the rating ratio.

LINKS

Task 2057301
PR #35870
---
 addons/website_rating/static/src/js/website_mail.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/addons/website_rating/static/src/js/website_mail.js b/addons/website_rating/static/src/js/website_mail.js
index 5b4f1b04f70..38c885f287c 100644
--- a/addons/website_rating/static/src/js/website_mail.js
+++ b/addons/website_rating/static/src/js/website_mail.js
@@ -67,7 +67,10 @@ PortalComposer.include({
             // rating stars
             self.$input = self.$('input[name="rating_value"]');
             self.$star_list = self.$('.stars').find('i');
-            self.set("star_value", self.options.default_rating_value); // set the default value to trigger the display of star widget
+
+            // set the default value to trigger the display of star widget and update the hidden input value.
+            self.set("star_value", self.options.default_rating_value); 
+            self.$input.val(self.options.default_rating_value * STAR_RATING_RATIO);
         });
     },
 

From 226e21c403a0bd7a44accfe7c24085585dffc85b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 21 Aug 2019 09:11:38 +0000
Subject: [PATCH 2/6] [IMP] website mail: remove useless public channel data

PURPOSE

Fix frontend rating and clean a bit module organization

SPECIFICATIONS

Remove useless mail.channel data as it makes noise without any added value.

LINKS

Task 2057301
PR #35870
---
 addons/website_mail/__manifest__.py            |  1 -
 addons/website_mail/data/mail_channel_data.xml | 14 --------------
 2 files changed, 15 deletions(-)
 delete mode 100644 addons/website_mail/data/mail_channel_data.xml

diff --git a/addons/website_mail/__manifest__.py b/addons/website_mail/__manifest__.py
index 45571be05b3..a607382a998 100644
--- a/addons/website_mail/__manifest__.py
+++ b/addons/website_mail/__manifest__.py
@@ -13,7 +13,6 @@ It is responsible of comments moderation for published documents (forum, slides,
     'depends': ['website', 'mail'],
     'data': [
         'views/website_mail_templates.xml',
-        'data/mail_channel_data.xml',
         'security/website_mail_security.xml',
     ],
     'qweb': [
diff --git a/addons/website_mail/data/mail_channel_data.xml b/addons/website_mail/data/mail_channel_data.xml
deleted file mode 100644
index 785a7aefd77..00000000000
--- a/addons/website_mail/data/mail_channel_data.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-
-        <record id="channel_public" model="mail.channel">
-            <field name="name">Discussion Group</field>
-            <field name="public">public</field>
-            <field name="description">Public Discussion Group</field>
-        </record>
-
-    </data>
-
-</odoo>
-

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 3/6] [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>

From d6ac39c6c30dfc18c20f8e9d85c4b9592075199b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 21 Aug 2019 12:30:47 +0000
Subject: [PATCH 4/6] [IMP] website_rating: remove useless templates

PURPOSE

Fix frontend rating and clean a bit module organization

SPECIFICATIONS

Remove unused template to lessen noise in this module.

LINKS

Task 2057301
PR #35870
---
 .../views/website_rating_templates.xml        | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/addons/website_rating/views/website_rating_templates.xml b/addons/website_rating/views/website_rating_templates.xml
index aedfb2f9631..2b7bfbcabd6 100644
--- a/addons/website_rating/views/website_rating_templates.xml
+++ b/addons/website_rating/views/website_rating_templates.xml
@@ -14,30 +14,6 @@
         </xpath>
     </template>
 
-    <!--
-        Rating widget static: show 5 stars (full or empty) regarding the given rating_avg and rating_count
-    -->
-    <template id="rating_widget_stars_static" name="Rating: static star widget">
-        <t t-set="rating_avg" t-value="round(rating_avg * 100) / 100 / 2"/>
-        <t t-set="val_decimal" t-value="round(rating_avg % 1, 1)"/>
-        <t t-set="val_integer" t-value="int(rating_avg)"/>
-        <t t-set="empty_star" t-value="5 - (val_integer+1) if val_decimal else 5 - val_integer"/>
-        <div class="o_website_rating_static" t-att-style="'display:inline' if inline_mode else ''" t-att-title="rating_avg">
-            <t t-foreach="range(0, val_integer)" t-as="num">
-                <i class="fa fa-star" role="img"></i>
-            </t>
-            <t t-if="val_decimal">
-                <i class="fa fa-star-half-o" role="img"></i>
-            </t>
-            <t t-foreach="range(0, empty_star)" t-as="num">
-                <i class="fa fa-star text-black-25" role="img"></i>
-            </t>
-            <t t-if="rating_count">
-                (<t t-esc="rating_count"/>)
-            </t>
-        </div>
-    </template>
-
     <!--
         Display static star widget, and open rating composer on click
         This template provide the container of the Popup Rating Composer. The rest is done in js.

From 26b7b0e2860d46d73790a82aac4ed6fb3a51f604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 21 Aug 2019 12:24:55 +0000
Subject: [PATCH 5/6] [MOV] website_rating: rename portal 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_rating/__manifest__.py         |  5 +-
 addons/website_rating/controllers/__init__.py |  2 +-
 .../{website_mail.py => portal_chatter.py}    |  6 +-
 .../js/{website_mail.js => portal_chatter.js} | 64 +----------------
 .../static/src/js/portal_rating_composer.js   | 71 +++++++++++++++++++
 .../static/src/xml/portal_chatter.xml         | 54 --------------
 .../static/src/xml/portal_rating_composer.xml | 53 ++++++++++++++
 .../{website_mail.xml => portal_tools.xml}    |  2 -
 addons/website_rating/views/assets.xml        | 12 ++++
 .../website_rating/views/portal_templates.xml |  8 +++
 ...ing_templates.xml => rating_templates.xml} |  7 --
 .../static/src/js/rating_field_backend.js     |  4 +-
 12 files changed, 154 insertions(+), 134 deletions(-)
 rename addons/website_rating/controllers/{website_mail.py => portal_chatter.py} (87%)
 rename addons/website_rating/static/src/js/{website_mail.js => portal_chatter.js} (82%)
 create mode 100644 addons/website_rating/static/src/js/portal_rating_composer.js
 create mode 100644 addons/website_rating/static/src/xml/portal_rating_composer.xml
 rename addons/website_rating/static/src/xml/{website_mail.xml => portal_tools.xml} (99%)
 create mode 100644 addons/website_rating/views/assets.xml
 create mode 100644 addons/website_rating/views/portal_templates.xml
 rename addons/website_rating/views/{website_rating_templates.xml => rating_templates.xml} (82%)

diff --git a/addons/website_rating/__manifest__.py b/addons/website_rating/__manifest__.py
index 4ef33b67977..610a61f3183 100644
--- a/addons/website_rating/__manifest__.py
+++ b/addons/website_rating/__manifest__.py
@@ -10,8 +10,9 @@ Bridge module for rating on website stuff.
         """,
     'depends': ['rating', 'website_mail'],
     'data': [
-        'views/website_rating_templates.xml',
+        'views/assets.xml',
+        'views/portal_templates.xml',
+        'views/rating_templates.xml',
     ],
-    'qweb': ['static/src/xml/*.xml'],
     'auto_install': True,
 }
diff --git a/addons/website_rating/controllers/__init__.py b/addons/website_rating/controllers/__init__.py
index a8136630fc9..be30644ac93 100644
--- a/addons/website_rating/controllers/__init__.py
+++ b/addons/website_rating/controllers/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import website_mail
+from . import portal_chatter
diff --git a/addons/website_rating/controllers/website_mail.py b/addons/website_rating/controllers/portal_chatter.py
similarity index 87%
rename from addons/website_rating/controllers/website_mail.py
rename to addons/website_rating/controllers/portal_chatter.py
index 9b56deebcd6..e74ef0a785f 100644
--- a/addons/website_rating/controllers/website_mail.py
+++ b/addons/website_rating/controllers/portal_chatter.py
@@ -7,11 +7,11 @@ from odoo.http import request
 from odoo.addons.portal.controllers.mail import PortalChatter
 
 
-class WebsiteRating(PortalChatter):
+class PortalChatter(PortalChatter):
 
     @http.route()
     def portal_chatter_init(self, res_model, res_id, domain=False, limit=False, **kwargs):
-        result = super(WebsiteRating, self).portal_chatter_init(res_model, res_id, domain=domain, limit=limit, **kwargs)
+        result = super(PortalChatter, self).portal_chatter_init(res_model, res_id, domain=domain, limit=limit, **kwargs)
         # get the rating statistics about the record
         if kwargs.get('rating_include'):
             record = request.env[res_model].browse(res_id)
@@ -26,4 +26,4 @@ class WebsiteRating(PortalChatter):
             context = dict(request.context)
             context['rating_include'] = True
             request.context = context
-        return super(WebsiteRating, self).portal_message_fetch(res_model, res_id, domain=domain, limit=limit, offset=offset, **kw)
+        return super(PortalChatter, self).portal_message_fetch(res_model, res_id, domain=domain, limit=limit, offset=offset, **kw)
diff --git a/addons/website_rating/static/src/js/website_mail.js b/addons/website_rating/static/src/js/portal_chatter.js
similarity index 82%
rename from addons/website_rating/static/src/js/website_mail.js
rename to addons/website_rating/static/src/js/portal_chatter.js
index 38c885f287c..d3a351ad9c1 100644
--- a/addons/website_rating/static/src/js/website_mail.js
+++ b/addons/website_rating/static/src/js/portal_chatter.js
@@ -2,8 +2,6 @@ odoo.define('website_rating.thread', function (require) {
 'use strict';
 
 var core = require('web.core');
-var publicWidget = require('web.public.widget');
-var session = require('web.session');
 var portalChatter = require('portal.chatter');
 var utils = require('web.utils');
 
@@ -139,7 +137,7 @@ PortalChatter.include({
     }),
     xmlDependencies: (PortalChatter.prototype.xmlDependencies || [])
         .concat([
-            '/website_rating/static/src/xml/website_mail.xml',
+            '/website_rating/static/src/xml/portal_tools.xml',
             '/website_rating/static/src/xml/portal_chatter.xml'
         ]),
 
@@ -294,64 +292,4 @@ PortalChatter.include({
         this._changeCurrentPage(1, domain);
     },
 });
-
-/**
- * RatingPopupComposer
- *
- * Display the rating average with a static star widget, and open
- * a popup with the portal composer when clicking on it.
- **/
-var RatingPopupComposer = publicWidget.Widget.extend({
-    template: 'website_rating.PopupComposer',
-    xmlDependencies: [
-        '/portal/static/src/xml/portal_chatter.xml',
-        '/website_rating/static/src/xml/website_mail.xml',
-        '/website_rating/static/src/xml/portal_chatter.xml',
-    ],
-
-    init: function (parent, options) {
-        this._super.apply(this, arguments);
-        this.rating_avg = Math.round(options['ratingAvg'] / STAR_RATING_RATIO * 100) / 100 || 0.0;
-        this.rating_total = options['ratingTotal'] || 0.0;
-
-        this.options = _.defaults({}, options, {
-            'token': false,
-            'res_model': false,
-            'res_id': false,
-            'pid': 0,
-            'display_composer': options['disable_composer'] ? false : !session.is_website_user,
-            'display_rating': true,
-            'csrf_token': odoo.csrf_token,
-            'user_id': session.user_id,
-        });
-    },
-    /**
-     * @override
-     */
-    start: function () {
-        var defs = [];
-        defs.push(this._super.apply(this, arguments));
-
-        // instanciate and insert composer widget
-        this._composer = new PortalComposer(this, this.options);
-        defs.push(this._composer.replace(this.$('.o_portal_chatter_composer')));
-
-        return Promise.all(defs);
-    },
-});
-
-publicWidget.registry.RatingPopupComposer = publicWidget.Widget.extend({
-    selector: '.o_rating_popup_composer',
-
-    /**
-     * @override
-     */
-    start: function () {
-        var ratingPopup = new RatingPopupComposer(this, this.$el.data());
-        return Promise.all([
-            this._super.apply(this, arguments),
-            ratingPopup.appendTo(this.$el)
-        ]);
-    },
-});
 });
diff --git a/addons/website_rating/static/src/js/portal_rating_composer.js b/addons/website_rating/static/src/js/portal_rating_composer.js
new file mode 100644
index 00000000000..78e6a4d4d1d
--- /dev/null
+++ b/addons/website_rating/static/src/js/portal_rating_composer.js
@@ -0,0 +1,71 @@
+odoo.define('portal.rating.composer', function (require) {
+'use strict';
+
+var publicWidget = require('web.public.widget');
+var session = require('web.session');
+var portalChatter = require('portal.chatter');
+
+var PortalComposer = portalChatter.PortalComposer;
+
+var STAR_RATING_RATIO = 2;  // conversion factor from the star (1-5) to the db rating range (1-10)
+
+/**
+ * RatingPopupComposer
+ *
+ * Display the rating average with a static star widget, and open
+ * a popup with the portal composer when clicking on it.
+ **/
+var RatingPopupComposer = publicWidget.Widget.extend({
+    template: 'website_rating.PopupComposer',
+    xmlDependencies: [
+        '/portal/static/src/xml/portal_chatter.xml',
+        '/website_rating/static/src/xml/portal_tools.xml',
+        '/website_rating/static/src/xml/portal_rating_composer.xml',
+    ],
+
+    init: function (parent, options) {
+        this._super.apply(this, arguments);
+        this.rating_avg = Math.round(options['ratingAvg'] / STAR_RATING_RATIO * 100) / 100 || 0.0;
+        this.rating_total = options['ratingTotal'] || 0.0;
+
+        this.options = _.defaults({}, options, {
+            'token': false,
+            'res_model': false,
+            'res_id': false,
+            'pid': 0,
+            'display_composer': options['disable_composer'] ? false : !session.is_website_user,
+            'display_rating': true,
+            'csrf_token': odoo.csrf_token,
+            'user_id': session.user_id,
+        });
+    },
+    /**
+     * @override
+     */
+    start: function () {
+        var defs = [];
+        defs.push(this._super.apply(this, arguments));
+
+        // instanciate and insert composer widget
+        this._composer = new PortalComposer(this, this.options);
+        defs.push(this._composer.replace(this.$('.o_portal_chatter_composer')));
+
+        return Promise.all(defs);
+    },
+});
+
+publicWidget.registry.RatingPopupComposer = publicWidget.Widget.extend({
+    selector: '.o_rating_popup_composer',
+
+    /**
+     * @override
+     */
+    start: function () {
+        var ratingPopup = new RatingPopupComposer(this, this.$el.data());
+        return Promise.all([
+            this._super.apply(this, arguments),
+            ratingPopup.appendTo(this.$el)
+        ]);
+    },
+});
+});
diff --git a/addons/website_rating/static/src/xml/portal_chatter.xml b/addons/website_rating/static/src/xml/portal_chatter.xml
index cebaea338d5..c2bbb2781e6 100644
--- a/addons/website_rating/static/src/xml/portal_chatter.xml
+++ b/addons/website_rating/static/src/xml/portal_chatter.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
-
     <!--
         Inherited templates from portal to custom chatter with rating
     -->
@@ -37,57 +36,4 @@
             </t>
         </t>
     </t>
-
-
-    <!--
-        Popup Rating Composer Widget
-        It can alse be used to modify a message
-    -->
-    <t t-name="website_rating.PopupComposer">
-        <div class="d-flex flex-wrap align-items-center">
-            <div class="text-nowrap">
-                <t t-call="website_rating.rating_stars_static">
-                    <t t-set="val" t-value="widget.rating_avg || 0"/>
-                    <t t-set="inline_mode" t-value="true"/>
-                </t>
-                <t t-if="widget.rating_total">
-                   <small>(<t t-esc="widget.rating_total"/> ratings)</small>
-                </t>
-            </div>
-            <button t-if="widget.options['display_composer']" type="button" class="btn btn-sm btn-primary mx-3" data-toggle="modal" data-target="#ratingpopupcomposer">
-                <t t-if="widget.options['display_composer']">
-                    <t t-if="widget.options['default_message_id']">
-                        Modify your review
-                    </t>
-                    <t t-else="">
-                        Add a review
-                    </t>
-                </t>
-            </button>
-        </div>
-
-        <div t-if="widget.options['display_composer']" class="modal fade" id="ratingpopupcomposer" tabindex="-1" role="dialog" aria-labelledby="ratingpopupcomposerlabel" aria-hidden="true">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title o_rating_popup_composer_label" id="ratingpopupcomposerlabel">
-                            <t t-if="widget.options['default_message_id']">
-                                Modify your review
-                            </t>
-                            <t t-else="">
-                                Add a review
-                            </t>
-                        </h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span>&amp;times;</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        <div class="o_portal_chatter_composer"/>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </t>
-
 </templates>
diff --git a/addons/website_rating/static/src/xml/portal_rating_composer.xml b/addons/website_rating/static/src/xml/portal_rating_composer.xml
new file mode 100644
index 00000000000..38d041a060e
--- /dev/null
+++ b/addons/website_rating/static/src/xml/portal_rating_composer.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <!--
+        Popup Rating Composer Widget
+        It can alse be used to modify a message
+    -->
+    <t t-name="website_rating.PopupComposer">
+        <div class="d-flex flex-wrap align-items-center">
+            <div class="text-nowrap">
+                <t t-call="website_rating.rating_stars_static">
+                    <t t-set="val" t-value="widget.rating_avg || 0"/>
+                    <t t-set="inline_mode" t-value="true"/>
+                </t>
+                <t t-if="widget.rating_total">
+                   <small>(<t t-esc="widget.rating_total"/> ratings)</small>
+                </t>
+            </div>
+            <button t-if="widget.options['display_composer']" type="button" class="btn btn-sm btn-primary mx-3" data-toggle="modal" data-target="#ratingpopupcomposer">
+                <t t-if="widget.options['display_composer']">
+                    <t t-if="widget.options['default_message_id']">
+                        Modify your review
+                    </t>
+                    <t t-else="">
+                        Add a review
+                    </t>
+                </t>
+            </button>
+        </div>
+
+        <div t-if="widget.options['display_composer']" class="modal fade" id="ratingpopupcomposer" tabindex="-1" role="dialog" aria-labelledby="ratingpopupcomposerlabel" aria-hidden="true">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title o_rating_popup_composer_label" id="ratingpopupcomposerlabel">
+                            <t t-if="widget.options['default_message_id']">
+                                Modify your review
+                            </t>
+                            <t t-else="">
+                                Add a review
+                            </t>
+                        </h5>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span>&amp;times;</span>
+                        </button>
+                    </div>
+                    <div class="modal-body">
+                        <div class="o_portal_chatter_composer"/>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+</templates>
diff --git a/addons/website_rating/static/src/xml/website_mail.xml b/addons/website_rating/static/src/xml/portal_tools.xml
similarity index 99%
rename from addons/website_rating/static/src/xml/website_mail.xml
rename to addons/website_rating/static/src/xml/portal_tools.xml
index f7a3cf3b280..07460b72f53 100644
--- a/addons/website_rating/static/src/xml/website_mail.xml
+++ b/addons/website_rating/static/src/xml/portal_tools.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates id="template" xml:space="preserve">
-
     <t t-name="website_rating.rating_stars_static">
         <t t-set="val_integer" t-value="Math.floor(val)"/>
         <t t-set="val_decimal" t-value="val - val_integer"/>
@@ -85,5 +84,4 @@
             <input type="hidden" readonly="readonly" name="rating_value" t-att-value="default_rating || ''"/>
         </div>
     </t>
-
 </templates>
diff --git a/addons/website_rating/views/assets.xml b/addons/website_rating/views/assets.xml
new file mode 100644
index 00000000000..70ff3ed7c13
--- /dev/null
+++ b/addons/website_rating/views/assets.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="assets_frontend" inherit_id="web_editor.assets_frontend" name="Portal Rating Assets">
+        <xpath expr="//link[last()]" position="after">
+            <link rel="stylesheet" type="text/scss" href="/website_rating/static/src/scss/website_rating.scss"/>
+        </xpath>
+        <xpath expr="//script[last()]" position="after">
+            <script type="text/javascript" src="/website_rating/static/src/js/portal_chatter.js"></script>
+            <script type="text/javascript" src="/website_rating/static/src/js/portal_rating_composer.js"></script>
+        </xpath>
+    </template>
+</odoo>
diff --git a/addons/website_rating/views/portal_templates.xml b/addons/website_rating/views/portal_templates.xml
new file mode 100644
index 00000000000..d616bc491c9
--- /dev/null
+++ b/addons/website_rating/views/portal_templates.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="message_thread" inherit_id="portal.message_thread">
+        <xpath expr="//div[@id='discussion']" position="attributes">
+            <attribute name="t-att-data-display_rating">display_rating or False</attribute>
+        </xpath>
+    </template>
+</odoo>
diff --git a/addons/website_rating/views/website_rating_templates.xml b/addons/website_rating/views/rating_templates.xml
similarity index 82%
rename from addons/website_rating/views/website_rating_templates.xml
rename to addons/website_rating/views/rating_templates.xml
index 2b7bfbcabd6..8f7a287f336 100644
--- a/addons/website_rating/views/website_rating_templates.xml
+++ b/addons/website_rating/views/rating_templates.xml
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <template id="assets_frontend" inherit_id="website.assets_frontend" name="Website rating frontend assets">
-        <xpath expr="." position="inside">
-            <script type="text/javascript" src="/website_rating/static/src/js/website_mail.js"></script>
-            <link rel="stylesheet" type="text/scss" href="/website_rating/static/src/scss/website_rating.scss"/>
-        </xpath>
-    </template>
-
     <template id="message_thread" inherit_id="portal.message_thread">
         <xpath expr="//div[@id='discussion']" position="attributes">
             <attribute name="t-att-data-display_rating">display_rating or False</attribute>
diff --git a/addons/website_slides/static/src/js/rating_field_backend.js b/addons/website_slides/static/src/js/rating_field_backend.js
index 2c6d8ca38dd..a84065437ba 100644
--- a/addons/website_slides/static/src/js/rating_field_backend.js
+++ b/addons/website_slides/static/src/js/rating_field_backend.js
@@ -10,8 +10,8 @@ var QWeb = core.qweb;
 
 var FieldFloatRating = basicFields.FieldFloat.extend({
     xmlDependencies: !basicFields.FieldFloat.prototype.xmlDependencies ?
-        ['/website_rating/static/src/xml/website_mail.xml'] : basicFields.FieldFloat.prototype.xmlDependencies.concat(
-            ['/website_rating/static/src/xml/website_mail.xml']
+        ['/website_rating/static/src/xml/portal_tools.xml'] : basicFields.FieldFloat.prototype.xmlDependencies.concat(
+            ['/website_rating/static/src/xml/portal_tools.xml']
         ),
     description: "",
     //--------------------------------------------------------------------------

From 532b1a5093fa50aa80cb3643f03cf9a6802098d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Wed, 21 Aug 2019 12:25:48 +0000
Subject: [PATCH 6/6] [FIX] portal, website_rating: re-allow rating from
 frontend

PURPOSE

Fix frontend rating and clean a bit module organization

SPECIFICATIONS

Broken since 3620cb68a0190031d3e1a963d8554834ab7f192b

LINKS

Task 2057301
PR #35870
---
 addons/portal/controllers/mail.py             | 22 ++++++++++---------
 .../controllers/portal_chatter.py             |  5 +++++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/addons/portal/controllers/mail.py b/addons/portal/controllers/mail.py
index 1f776bb6ab1..0869089ff69 100644
--- a/addons/portal/controllers/mail.py
+++ b/addons/portal/controllers/mail.py
@@ -85,6 +85,9 @@ def _message_post_helper(res_model, res_id, message, token='', _hash=False, pid=
 
 class PortalChatter(http.Controller):
 
+    def _portal_post_filter_params(self):
+        return ['token', 'hash', 'pid']
+
     @http.route(['/mail/chatter_post'], type='http', methods=['POST'], auth='public', website=True)
     def portal_chatter_post(self, res_model, res_id, message, redirect=None, attachment_ids='', attachment_tokens='', **kw):
         """Create a new `mail.message` with the given `message` and/or
@@ -112,16 +115,15 @@ class PortalChatter(http.Controller):
             # message is received in plaintext and saved in html
             if message:
                 message = plaintext2html(message)
-            message = _message_post_helper(
-                res_model=res_model,
-                res_id=res_id,
-                token=kw.get('token'),
-                _hash=kw.get('hash'),
-                pid=kw.get('pid'),
-                message=message,
-                send_after_commit=False,
-                attachment_ids=attachment_ids
-            )
+            post_values = {
+                'res_model': res_model,
+                'res_id': res_id,
+                'message': message,
+                'send_after_commit': False,
+                'attachment_ids': attachment_ids,
+            }
+            post_values.update((fname, kw.get(fname)) for fname in self._portal_post_filter_params())
+            message = _message_post_helper(**post_values)
 
         return request.redirect(url)
 
diff --git a/addons/website_rating/controllers/portal_chatter.py b/addons/website_rating/controllers/portal_chatter.py
index e74ef0a785f..c252d2f73e7 100644
--- a/addons/website_rating/controllers/portal_chatter.py
+++ b/addons/website_rating/controllers/portal_chatter.py
@@ -9,6 +9,11 @@ from odoo.addons.portal.controllers.mail import PortalChatter
 
 class PortalChatter(PortalChatter):
 
+    def _portal_post_filter_params(self):
+        fields = super(PortalChatter, self)._portal_post_filter_params()
+        fields.append('rating_value')
+        return fields
+
     @http.route()
     def portal_chatter_init(self, res_model, res_id, domain=False, limit=False, **kwargs):
         result = super(PortalChatter, self).portal_chatter_init(res_model, res_id, domain=domain, limit=limit, **kwargs)