diff --git a/addons/portal/static/src/xml/portal_chatter.xml b/addons/portal/static/src/xml/portal_chatter.xml index 52a3d77c7bd..179d4f70626 100644 --- a/addons/portal/static/src/xml/portal_chatter.xml +++ b/addons/portal/static/src/xml/portal_chatter.xml @@ -119,7 +119,7 @@ + title="Currently available to everyone viewing this document, click to restrict to internal employees.">Visible diff --git a/addons/website_rating/__init__.py b/addons/portal_rating/__init__.py similarity index 100% rename from addons/website_rating/__init__.py rename to addons/portal_rating/__init__.py diff --git a/addons/website_rating/__manifest__.py b/addons/portal_rating/__manifest__.py similarity index 61% rename from addons/website_rating/__manifest__.py rename to addons/portal_rating/__manifest__.py index 3a454763d21..273f594dad6 100644 --- a/addons/website_rating/__manifest__.py +++ b/addons/portal_rating/__manifest__.py @@ -2,13 +2,17 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. { - 'name': 'Website Rating', + 'name': 'Portal Rating', 'category': 'Hidden', 'version': '1.0', 'description': """ -Bridge module for rating on website stuff. +Bridge module adding rating capabilities on portal. It includes notably +inclusion of rating directly within the customer portal discuss widget. """, - 'depends': ['rating', 'website_mail'], + 'depends': [ + 'portal', + 'rating', + ], 'data': [ 'views/assets.xml', 'views/rating_views.xml', diff --git a/addons/website_rating/controllers/__init__.py b/addons/portal_rating/controllers/__init__.py similarity index 100% rename from addons/website_rating/controllers/__init__.py rename to addons/portal_rating/controllers/__init__.py diff --git a/addons/website_rating/controllers/portal_chatter.py b/addons/portal_rating/controllers/portal_chatter.py similarity index 100% rename from addons/website_rating/controllers/portal_chatter.py rename to addons/portal_rating/controllers/portal_chatter.py diff --git a/addons/website_rating/controllers/portal_rating.py b/addons/portal_rating/controllers/portal_rating.py similarity index 100% rename from addons/website_rating/controllers/portal_rating.py rename to addons/portal_rating/controllers/portal_rating.py diff --git a/addons/website_rating/i18n/ar.po b/addons/portal_rating/i18n/ar.po similarity index 100% rename from addons/website_rating/i18n/ar.po rename to addons/portal_rating/i18n/ar.po diff --git a/addons/website_rating/i18n/az.po b/addons/portal_rating/i18n/az.po similarity index 100% rename from addons/website_rating/i18n/az.po rename to addons/portal_rating/i18n/az.po diff --git a/addons/website_rating/i18n/bs.po b/addons/portal_rating/i18n/bs.po similarity index 100% rename from addons/website_rating/i18n/bs.po rename to addons/portal_rating/i18n/bs.po diff --git a/addons/website_rating/i18n/ca.po b/addons/portal_rating/i18n/ca.po similarity index 100% rename from addons/website_rating/i18n/ca.po rename to addons/portal_rating/i18n/ca.po diff --git a/addons/website_rating/i18n/cs.po b/addons/portal_rating/i18n/cs.po similarity index 100% rename from addons/website_rating/i18n/cs.po rename to addons/portal_rating/i18n/cs.po diff --git a/addons/website_rating/i18n/da.po b/addons/portal_rating/i18n/da.po similarity index 100% rename from addons/website_rating/i18n/da.po rename to addons/portal_rating/i18n/da.po diff --git a/addons/website_rating/i18n/de.po b/addons/portal_rating/i18n/de.po similarity index 100% rename from addons/website_rating/i18n/de.po rename to addons/portal_rating/i18n/de.po diff --git a/addons/website_rating/i18n/el.po b/addons/portal_rating/i18n/el.po similarity index 100% rename from addons/website_rating/i18n/el.po rename to addons/portal_rating/i18n/el.po diff --git a/addons/website_rating/i18n/es.po b/addons/portal_rating/i18n/es.po similarity index 100% rename from addons/website_rating/i18n/es.po rename to addons/portal_rating/i18n/es.po diff --git a/addons/website_rating/i18n/et.po b/addons/portal_rating/i18n/et.po similarity index 100% rename from addons/website_rating/i18n/et.po rename to addons/portal_rating/i18n/et.po diff --git a/addons/website_rating/i18n/fa.po b/addons/portal_rating/i18n/fa.po similarity index 100% rename from addons/website_rating/i18n/fa.po rename to addons/portal_rating/i18n/fa.po diff --git a/addons/website_rating/i18n/fi.po b/addons/portal_rating/i18n/fi.po similarity index 100% rename from addons/website_rating/i18n/fi.po rename to addons/portal_rating/i18n/fi.po diff --git a/addons/website_rating/i18n/fr.po b/addons/portal_rating/i18n/fr.po similarity index 100% rename from addons/website_rating/i18n/fr.po rename to addons/portal_rating/i18n/fr.po diff --git a/addons/website_rating/i18n/gu.po b/addons/portal_rating/i18n/gu.po similarity index 100% rename from addons/website_rating/i18n/gu.po rename to addons/portal_rating/i18n/gu.po diff --git a/addons/website_rating/i18n/he.po b/addons/portal_rating/i18n/he.po similarity index 100% rename from addons/website_rating/i18n/he.po rename to addons/portal_rating/i18n/he.po diff --git a/addons/website_rating/i18n/hr.po b/addons/portal_rating/i18n/hr.po similarity index 100% rename from addons/website_rating/i18n/hr.po rename to addons/portal_rating/i18n/hr.po diff --git a/addons/website_rating/i18n/hu.po b/addons/portal_rating/i18n/hu.po similarity index 100% rename from addons/website_rating/i18n/hu.po rename to addons/portal_rating/i18n/hu.po diff --git a/addons/website_rating/i18n/id.po b/addons/portal_rating/i18n/id.po similarity index 100% rename from addons/website_rating/i18n/id.po rename to addons/portal_rating/i18n/id.po diff --git a/addons/website_rating/i18n/is.po b/addons/portal_rating/i18n/is.po similarity index 100% rename from addons/website_rating/i18n/is.po rename to addons/portal_rating/i18n/is.po diff --git a/addons/website_rating/i18n/it.po b/addons/portal_rating/i18n/it.po similarity index 100% rename from addons/website_rating/i18n/it.po rename to addons/portal_rating/i18n/it.po diff --git a/addons/website_rating/i18n/ja.po b/addons/portal_rating/i18n/ja.po similarity index 100% rename from addons/website_rating/i18n/ja.po rename to addons/portal_rating/i18n/ja.po diff --git a/addons/website_rating/i18n/km.po b/addons/portal_rating/i18n/km.po similarity index 100% rename from addons/website_rating/i18n/km.po rename to addons/portal_rating/i18n/km.po diff --git a/addons/website_rating/i18n/ko.po b/addons/portal_rating/i18n/ko.po similarity index 100% rename from addons/website_rating/i18n/ko.po rename to addons/portal_rating/i18n/ko.po diff --git a/addons/website_rating/i18n/lb.po b/addons/portal_rating/i18n/lb.po similarity index 100% rename from addons/website_rating/i18n/lb.po rename to addons/portal_rating/i18n/lb.po diff --git a/addons/website_rating/i18n/lt.po b/addons/portal_rating/i18n/lt.po similarity index 100% rename from addons/website_rating/i18n/lt.po rename to addons/portal_rating/i18n/lt.po diff --git a/addons/website_rating/i18n/lv.po b/addons/portal_rating/i18n/lv.po similarity index 100% rename from addons/website_rating/i18n/lv.po rename to addons/portal_rating/i18n/lv.po diff --git a/addons/website_rating/i18n/mn.po b/addons/portal_rating/i18n/mn.po similarity index 100% rename from addons/website_rating/i18n/mn.po rename to addons/portal_rating/i18n/mn.po diff --git a/addons/website_rating/i18n/nb.po b/addons/portal_rating/i18n/nb.po similarity index 100% rename from addons/website_rating/i18n/nb.po rename to addons/portal_rating/i18n/nb.po diff --git a/addons/website_rating/i18n/nl.po b/addons/portal_rating/i18n/nl.po similarity index 100% rename from addons/website_rating/i18n/nl.po rename to addons/portal_rating/i18n/nl.po diff --git a/addons/website_rating/i18n/pl.po b/addons/portal_rating/i18n/pl.po similarity index 100% rename from addons/website_rating/i18n/pl.po rename to addons/portal_rating/i18n/pl.po diff --git a/addons/website_rating/i18n/pt.po b/addons/portal_rating/i18n/pt.po similarity index 100% rename from addons/website_rating/i18n/pt.po rename to addons/portal_rating/i18n/pt.po diff --git a/addons/website_rating/i18n/pt_BR.po b/addons/portal_rating/i18n/pt_BR.po similarity index 100% rename from addons/website_rating/i18n/pt_BR.po rename to addons/portal_rating/i18n/pt_BR.po diff --git a/addons/website_rating/i18n/ro.po b/addons/portal_rating/i18n/ro.po similarity index 100% rename from addons/website_rating/i18n/ro.po rename to addons/portal_rating/i18n/ro.po diff --git a/addons/website_rating/i18n/ru.po b/addons/portal_rating/i18n/ru.po similarity index 100% rename from addons/website_rating/i18n/ru.po rename to addons/portal_rating/i18n/ru.po diff --git a/addons/website_rating/i18n/sk.po b/addons/portal_rating/i18n/sk.po similarity index 100% rename from addons/website_rating/i18n/sk.po rename to addons/portal_rating/i18n/sk.po diff --git a/addons/website_rating/i18n/sl.po b/addons/portal_rating/i18n/sl.po similarity index 100% rename from addons/website_rating/i18n/sl.po rename to addons/portal_rating/i18n/sl.po diff --git a/addons/website_rating/i18n/sr.po b/addons/portal_rating/i18n/sr.po similarity index 100% rename from addons/website_rating/i18n/sr.po rename to addons/portal_rating/i18n/sr.po diff --git a/addons/website_rating/i18n/sr@latin.po b/addons/portal_rating/i18n/sr@latin.po similarity index 100% rename from addons/website_rating/i18n/sr@latin.po rename to addons/portal_rating/i18n/sr@latin.po diff --git a/addons/website_rating/i18n/sv.po b/addons/portal_rating/i18n/sv.po similarity index 100% rename from addons/website_rating/i18n/sv.po rename to addons/portal_rating/i18n/sv.po diff --git a/addons/website_rating/i18n/th.po b/addons/portal_rating/i18n/th.po similarity index 100% rename from addons/website_rating/i18n/th.po rename to addons/portal_rating/i18n/th.po diff --git a/addons/website_rating/i18n/tr.po b/addons/portal_rating/i18n/tr.po similarity index 100% rename from addons/website_rating/i18n/tr.po rename to addons/portal_rating/i18n/tr.po diff --git a/addons/website_rating/i18n/uk.po b/addons/portal_rating/i18n/uk.po similarity index 100% rename from addons/website_rating/i18n/uk.po rename to addons/portal_rating/i18n/uk.po diff --git a/addons/website_rating/i18n/vi.po b/addons/portal_rating/i18n/vi.po similarity index 100% rename from addons/website_rating/i18n/vi.po rename to addons/portal_rating/i18n/vi.po diff --git a/addons/website_rating/i18n/website_rating.pot b/addons/portal_rating/i18n/website_rating.pot similarity index 100% rename from addons/website_rating/i18n/website_rating.pot rename to addons/portal_rating/i18n/website_rating.pot diff --git a/addons/website_rating/i18n/zh_CN.po b/addons/portal_rating/i18n/zh_CN.po similarity index 100% rename from addons/website_rating/i18n/zh_CN.po rename to addons/portal_rating/i18n/zh_CN.po diff --git a/addons/website_rating/i18n/zh_TW.po b/addons/portal_rating/i18n/zh_TW.po similarity index 100% rename from addons/website_rating/i18n/zh_TW.po rename to addons/portal_rating/i18n/zh_TW.po diff --git a/addons/website_rating/models/__init__.py b/addons/portal_rating/models/__init__.py similarity index 100% rename from addons/website_rating/models/__init__.py rename to addons/portal_rating/models/__init__.py diff --git a/addons/website_rating/models/mail_message.py b/addons/portal_rating/models/mail_message.py similarity index 100% rename from addons/website_rating/models/mail_message.py rename to addons/portal_rating/models/mail_message.py diff --git a/addons/website_rating/models/rating.py b/addons/portal_rating/models/rating.py similarity index 100% rename from addons/website_rating/models/rating.py rename to addons/portal_rating/models/rating.py diff --git a/addons/website_rating/static/src/js/portal_chatter.js b/addons/portal_rating/static/src/js/portal_chatter.js similarity index 97% rename from addons/website_rating/static/src/js/portal_chatter.js rename to addons/portal_rating/static/src/js/portal_chatter.js index c67b82a9974..51b403b521b 100644 --- a/addons/website_rating/static/src/js/portal_chatter.js +++ b/addons/portal_rating/static/src/js/portal_chatter.js @@ -30,8 +30,8 @@ PortalChatter.include({ }), xmlDependencies: (PortalChatter.prototype.xmlDependencies || []) .concat([ - '/website_rating/static/src/xml/portal_tools.xml', - '/website_rating/static/src/xml/portal_chatter.xml' + '/portal_rating/static/src/xml/portal_tools.xml', + '/portal_rating/static/src/xml/portal_chatter.xml' ]), /** @@ -256,7 +256,7 @@ PortalChatter.include({ var oldRating = this.messages[messageIndex].rating; data.rating.publisher_comment = oldRating.publisher_comment ? oldRating.publisher_comment : ''; - this._getCommentContainer($source).html($(qweb.render("website_rating.chatter_rating_publisher_form", data))); + this._getCommentContainer($source).html($(qweb.render("portal_rating.chatter_rating_publisher_form", data))); this._focusTextComment($source); }, @@ -309,7 +309,7 @@ PortalChatter.include({ if (self.messages[messageIndex].rating.publisher_comment !== '') { // Remove the button comment if exist and render the comment self._getCommentButton($source).addClass('d-none'); - self._getCommentContainer($source).html($(qweb.render("website_rating.chatter_rating_publisher_comment", { + self._getCommentContainer($source).html($(qweb.render("portal_rating.chatter_rating_publisher_comment", { rating: self.messages[messageIndex].rating, is_publisher: self.options.is_user_publisher }))); @@ -335,7 +335,7 @@ PortalChatter.include({ rating: this.messages[messageIndex].rating, is_publisher: this.options.is_user_publisher }; - this._getCommentContainer($source).html($(qweb.render("website_rating.chatter_rating_publisher_comment", data))); + this._getCommentContainer($source).html($(qweb.render("portal_rating.chatter_rating_publisher_comment", data))); } else { this._getCommentContainer($source).empty(); } diff --git a/addons/website_rating/static/src/js/portal_composer.js b/addons/portal_rating/static/src/js/portal_composer.js similarity index 100% rename from addons/website_rating/static/src/js/portal_composer.js rename to addons/portal_rating/static/src/js/portal_composer.js diff --git a/addons/website_rating/static/src/js/portal_rating_composer.js b/addons/portal_rating/static/src/js/portal_rating_composer.js similarity index 92% rename from addons/website_rating/static/src/js/portal_rating_composer.js rename to addons/portal_rating/static/src/js/portal_rating_composer.js index d9a78f17255..8bf205a6cb8 100644 --- a/addons/website_rating/static/src/js/portal_rating_composer.js +++ b/addons/portal_rating/static/src/js/portal_rating_composer.js @@ -16,11 +16,11 @@ var STAR_RATING_RATIO = 2; // conversion factor from the star (1-5) to the db r * a popup with the portal composer when clicking on it. **/ var RatingPopupComposer = publicWidget.Widget.extend({ - template: 'website_rating.PopupComposer', + template: 'portal_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', + '/portal_rating/static/src/xml/portal_tools.xml', + '/portal_rating/static/src/xml/portal_rating_composer.xml', ], init: function (parent, options) { diff --git a/addons/website_rating/static/src/scss/website_rating.scss b/addons/portal_rating/static/src/scss/portal_rating.scss similarity index 100% rename from addons/website_rating/static/src/scss/website_rating.scss rename to addons/portal_rating/static/src/scss/portal_rating.scss diff --git a/addons/website_rating/static/src/xml/portal_chatter.xml b/addons/portal_rating/static/src/xml/portal_chatter.xml similarity index 91% rename from addons/website_rating/static/src/xml/portal_chatter.xml rename to addons/portal_rating/static/src/xml/portal_chatter.xml index ba8fa74cc7c..5a397d8984b 100644 --- a/addons/website_rating/static/src/xml/portal_chatter.xml +++ b/addons/portal_rating/static/src/xml/portal_chatter.xml @@ -9,7 +9,7 @@ #{widget.options['force_submit_url'] ? widget.options['force_submit_url'] : '/mail/chatter_post'} - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -49,7 +49,7 @@ - +
- +
- +
avatar
@@ -89,7 +89,7 @@
- +
avatar
diff --git a/addons/website_rating/static/src/xml/portal_rating_composer.xml b/addons/portal_rating/static/src/xml/portal_rating_composer.xml similarity index 95% rename from addons/website_rating/static/src/xml/portal_rating_composer.xml rename to addons/portal_rating/static/src/xml/portal_rating_composer.xml index 38d041a060e..e4f58c3ec81 100644 --- a/addons/website_rating/static/src/xml/portal_rating_composer.xml +++ b/addons/portal_rating/static/src/xml/portal_rating_composer.xml @@ -4,10 +4,10 @@ Popup Rating Composer Widget It can alse be used to modify a message --> - +
- + diff --git a/addons/website_rating/static/src/xml/portal_tools.xml b/addons/portal_rating/static/src/xml/portal_tools.xml similarity index 95% rename from addons/website_rating/static/src/xml/portal_tools.xml rename to addons/portal_rating/static/src/xml/portal_tools.xml index 0d790041d0b..18d8c7f8a77 100644 --- a/addons/website_rating/static/src/xml/portal_tools.xml +++ b/addons/portal_rating/static/src/xml/portal_tools.xml @@ -1,6 +1,6 @@ - + @@ -17,13 +17,13 @@
- +

Average

- + @@ -61,7 +61,7 @@
- +
diff --git a/addons/portal_rating/views/assets.xml b/addons/portal_rating/views/assets.xml new file mode 100644 index 00000000000..d962bea4e6d --- /dev/null +++ b/addons/portal_rating/views/assets.xml @@ -0,0 +1,13 @@ + + + + diff --git a/addons/website_rating/views/portal_templates.xml b/addons/portal_rating/views/portal_templates.xml similarity index 100% rename from addons/website_rating/views/portal_templates.xml rename to addons/portal_rating/views/portal_templates.xml diff --git a/addons/website_rating/views/rating_templates.xml b/addons/portal_rating/views/rating_templates.xml similarity index 100% rename from addons/website_rating/views/rating_templates.xml rename to addons/portal_rating/views/rating_templates.xml diff --git a/addons/website_rating/views/rating_views.xml b/addons/portal_rating/views/rating_views.xml similarity index 100% rename from addons/website_rating/views/rating_views.xml rename to addons/portal_rating/views/rating_views.xml diff --git a/addons/website_rating/views/assets.xml b/addons/website_rating/views/assets.xml deleted file mode 100644 index f5f2dd2e8e9..00000000000 --- a/addons/website_rating/views/assets.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py index 5dfea3c026a..271cc58515e 100644 --- a/addons/website_sale/__manifest__.py +++ b/addons/website_sale/__manifest__.py @@ -6,7 +6,7 @@ 'website': 'https://www.odoo.com/page/e-commerce', 'version': '1.0', 'description': "", - 'depends': ['website', 'sale', 'website_payment', 'website_mail', 'website_form', 'website_rating', 'digest'], + 'depends': ['website', 'sale', 'website_payment', 'website_mail', 'website_form', 'portal_rating', 'digest'], 'data': [ 'security/ir.model.access.csv', 'security/website_sale.xml', diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py index 405cd3f5690..79664e37c6c 100644 --- a/addons/website_sale/controllers/main.py +++ b/addons/website_sale/controllers/main.py @@ -1243,7 +1243,7 @@ class WebsiteSale(http.Controller): res_product.update(combination_info) res_product['price'] = FieldMonetary.value_to_html(res_product['price'], monetary_options) if rating: - res_product['rating'] = request.env["ir.ui.view"].render_template('website_rating.rating_widget_stars_static', values={ + res_product['rating'] = request.env["ir.ui.view"].render_template('portal_rating.rating_widget_stars_static', values={ 'rating_avg': product.rating_avg, 'rating_count': product.rating_count, }) diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py index 604497299a5..b8d0520a792 100644 --- a/addons/website_slides/__manifest__.py +++ b/addons/website_slides/__manifest__.py @@ -20,10 +20,11 @@ Featuring * Statistics """, 'depends': [ + 'portal_rating', 'website', 'website_mail', 'website_profile', - 'website_rating'], + ], 'data': [ 'views/assets.xml', 'views/res_config_settings_views.xml', 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 66e32986a00..12a6d8b63b7 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/portal_tools.xml'] : basicFields.FieldFloat.prototype.xmlDependencies.concat( - ['/website_rating/static/src/xml/portal_tools.xml'] + ['/portal_rating/static/src/xml/portal_tools.xml'] : basicFields.FieldFloat.prototype.xmlDependencies.concat( + ['/portal_rating/static/src/xml/portal_tools.xml'] ), //-------------------------------------------------------------------------- // Private @@ -25,7 +25,7 @@ var FieldFloatRating = basicFields.FieldFloat.extend({ var self = this; return Promise.resolve(this._super()).then(function () { - self.$el.html(QWeb.render('website_rating.rating_stars_static', { + self.$el.html(QWeb.render('portal_rating.rating_stars_static', { 'val': self.value / 2, 'inline_mode': true })); diff --git a/addons/website_slides/views/website_slides_templates_course.xml b/addons/website_slides/views/website_slides_templates_course.xml index e9bc8668a82..22826d6dcd1 100644 --- a/addons/website_slides/views/website_slides_templates_course.xml +++ b/addons/website_slides/views/website_slides_templates_course.xml @@ -137,7 +137,7 @@
- +