summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Delavallée <tde@odoo.com>2019-10-24 14:05:48 +0000
committerThibault Delavallée <tde@odoo.com>2019-12-02 15:18:45 +0000
commit9e0677882d64ac2be92cd1ea147ce823e2d9f69b (patch)
tree389e992bf7ee18cf77ea08ca2e32a945d02c400d
parent82f56ffddfc6aed21030214dc95c0a3e9f5d9a93 (diff)
[MOV] website_rating: move to portal_rating
PURPOSE Clean posting process and improve mail.message definition and comprehension. Move as much possible content from website_* modules to portal_* modules to ease their use in customer portal SPECIFICATIONS Now that publish feature is replaced by internal directly in mail and portal rating portal inclusion can be done safely in a portal_ratign module instead of website_rating. It allows to remove the dependency and give the rating feature of customer chatter directly in portal applications. LINKS Task ID 2071556 PR #38692
-rw-r--r--addons/portal/static/src/xml/portal_chatter.xml2
-rw-r--r--addons/portal_rating/__init__.py (renamed from addons/website_rating/__init__.py)0
-rw-r--r--addons/portal_rating/__manifest__.py (renamed from addons/website_rating/__manifest__.py)10
-rw-r--r--addons/portal_rating/controllers/__init__.py (renamed from addons/website_rating/controllers/__init__.py)0
-rw-r--r--addons/portal_rating/controllers/portal_chatter.py (renamed from addons/website_rating/controllers/portal_chatter.py)0
-rw-r--r--addons/portal_rating/controllers/portal_rating.py (renamed from addons/website_rating/controllers/portal_rating.py)0
-rw-r--r--addons/portal_rating/i18n/ar.po (renamed from addons/website_rating/i18n/ar.po)0
-rw-r--r--addons/portal_rating/i18n/az.po (renamed from addons/website_rating/i18n/az.po)0
-rw-r--r--addons/portal_rating/i18n/bs.po (renamed from addons/website_rating/i18n/bs.po)0
-rw-r--r--addons/portal_rating/i18n/ca.po (renamed from addons/website_rating/i18n/ca.po)0
-rw-r--r--addons/portal_rating/i18n/cs.po (renamed from addons/website_rating/i18n/cs.po)0
-rw-r--r--addons/portal_rating/i18n/da.po (renamed from addons/website_rating/i18n/da.po)0
-rw-r--r--addons/portal_rating/i18n/de.po (renamed from addons/website_rating/i18n/de.po)0
-rw-r--r--addons/portal_rating/i18n/el.po (renamed from addons/website_rating/i18n/el.po)0
-rw-r--r--addons/portal_rating/i18n/es.po (renamed from addons/website_rating/i18n/es.po)0
-rw-r--r--addons/portal_rating/i18n/et.po (renamed from addons/website_rating/i18n/et.po)0
-rw-r--r--addons/portal_rating/i18n/fa.po (renamed from addons/website_rating/i18n/fa.po)0
-rw-r--r--addons/portal_rating/i18n/fi.po (renamed from addons/website_rating/i18n/fi.po)0
-rw-r--r--addons/portal_rating/i18n/fr.po (renamed from addons/website_rating/i18n/fr.po)0
-rw-r--r--addons/portal_rating/i18n/gu.po (renamed from addons/website_rating/i18n/gu.po)0
-rw-r--r--addons/portal_rating/i18n/he.po (renamed from addons/website_rating/i18n/he.po)0
-rw-r--r--addons/portal_rating/i18n/hr.po (renamed from addons/website_rating/i18n/hr.po)0
-rw-r--r--addons/portal_rating/i18n/hu.po (renamed from addons/website_rating/i18n/hu.po)0
-rw-r--r--addons/portal_rating/i18n/id.po (renamed from addons/website_rating/i18n/id.po)0
-rw-r--r--addons/portal_rating/i18n/is.po (renamed from addons/website_rating/i18n/is.po)0
-rw-r--r--addons/portal_rating/i18n/it.po (renamed from addons/website_rating/i18n/it.po)0
-rw-r--r--addons/portal_rating/i18n/ja.po (renamed from addons/website_rating/i18n/ja.po)0
-rw-r--r--addons/portal_rating/i18n/km.po (renamed from addons/website_rating/i18n/km.po)0
-rw-r--r--addons/portal_rating/i18n/ko.po (renamed from addons/website_rating/i18n/ko.po)0
-rw-r--r--addons/portal_rating/i18n/lb.po (renamed from addons/website_rating/i18n/lb.po)0
-rw-r--r--addons/portal_rating/i18n/lt.po (renamed from addons/website_rating/i18n/lt.po)0
-rw-r--r--addons/portal_rating/i18n/lv.po (renamed from addons/website_rating/i18n/lv.po)0
-rw-r--r--addons/portal_rating/i18n/mn.po (renamed from addons/website_rating/i18n/mn.po)0
-rw-r--r--addons/portal_rating/i18n/nb.po (renamed from addons/website_rating/i18n/nb.po)0
-rw-r--r--addons/portal_rating/i18n/nl.po (renamed from addons/website_rating/i18n/nl.po)0
-rw-r--r--addons/portal_rating/i18n/pl.po (renamed from addons/website_rating/i18n/pl.po)0
-rw-r--r--addons/portal_rating/i18n/pt.po (renamed from addons/website_rating/i18n/pt.po)0
-rw-r--r--addons/portal_rating/i18n/pt_BR.po (renamed from addons/website_rating/i18n/pt_BR.po)0
-rw-r--r--addons/portal_rating/i18n/ro.po (renamed from addons/website_rating/i18n/ro.po)0
-rw-r--r--addons/portal_rating/i18n/ru.po (renamed from addons/website_rating/i18n/ru.po)0
-rw-r--r--addons/portal_rating/i18n/sk.po (renamed from addons/website_rating/i18n/sk.po)0
-rw-r--r--addons/portal_rating/i18n/sl.po (renamed from addons/website_rating/i18n/sl.po)0
-rw-r--r--addons/portal_rating/i18n/sr.po (renamed from addons/website_rating/i18n/sr.po)0
-rw-r--r--addons/portal_rating/i18n/sr@latin.po (renamed from addons/website_rating/i18n/sr@latin.po)0
-rw-r--r--addons/portal_rating/i18n/sv.po (renamed from addons/website_rating/i18n/sv.po)0
-rw-r--r--addons/portal_rating/i18n/th.po (renamed from addons/website_rating/i18n/th.po)0
-rw-r--r--addons/portal_rating/i18n/tr.po (renamed from addons/website_rating/i18n/tr.po)0
-rw-r--r--addons/portal_rating/i18n/uk.po (renamed from addons/website_rating/i18n/uk.po)0
-rw-r--r--addons/portal_rating/i18n/vi.po (renamed from addons/website_rating/i18n/vi.po)0
-rw-r--r--addons/portal_rating/i18n/website_rating.pot (renamed from addons/website_rating/i18n/website_rating.pot)0
-rw-r--r--addons/portal_rating/i18n/zh_CN.po (renamed from addons/website_rating/i18n/zh_CN.po)0
-rw-r--r--addons/portal_rating/i18n/zh_TW.po (renamed from addons/website_rating/i18n/zh_TW.po)0
-rw-r--r--addons/portal_rating/models/__init__.py (renamed from addons/website_rating/models/__init__.py)0
-rw-r--r--addons/portal_rating/models/mail_message.py (renamed from addons/website_rating/models/mail_message.py)0
-rw-r--r--addons/portal_rating/models/rating.py (renamed from addons/website_rating/models/rating.py)0
-rw-r--r--addons/portal_rating/static/src/js/portal_chatter.js (renamed from addons/website_rating/static/src/js/portal_chatter.js)10
-rw-r--r--addons/portal_rating/static/src/js/portal_composer.js (renamed from addons/website_rating/static/src/js/portal_composer.js)0
-rw-r--r--addons/portal_rating/static/src/js/portal_rating_composer.js (renamed from addons/website_rating/static/src/js/portal_rating_composer.js)6
-rw-r--r--addons/portal_rating/static/src/scss/portal_rating.scss (renamed from addons/website_rating/static/src/scss/website_rating.scss)0
-rw-r--r--addons/portal_rating/static/src/xml/portal_chatter.xml (renamed from addons/website_rating/static/src/xml/portal_chatter.xml)16
-rw-r--r--addons/portal_rating/static/src/xml/portal_rating_composer.xml (renamed from addons/website_rating/static/src/xml/portal_rating_composer.xml)4
-rw-r--r--addons/portal_rating/static/src/xml/portal_tools.xml (renamed from addons/website_rating/static/src/xml/portal_tools.xml)8
-rw-r--r--addons/portal_rating/views/assets.xml13
-rw-r--r--addons/portal_rating/views/portal_templates.xml (renamed from addons/website_rating/views/portal_templates.xml)0
-rw-r--r--addons/portal_rating/views/rating_templates.xml (renamed from addons/website_rating/views/rating_templates.xml)0
-rw-r--r--addons/portal_rating/views/rating_views.xml (renamed from addons/website_rating/views/rating_views.xml)0
-rw-r--r--addons/website_rating/views/assets.xml13
-rw-r--r--addons/website_sale/__manifest__.py2
-rw-r--r--addons/website_sale/controllers/main.py2
-rw-r--r--addons/website_slides/__manifest__.py3
-rw-r--r--addons/website_slides/static/src/js/rating_field_backend.js6
-rw-r--r--addons/website_slides/views/website_slides_templates_course.xml2
72 files changed, 51 insertions, 46 deletions
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 @@
<button class="btn btn-danger"
title="Currently restricted to internal employees, click to make it available to everyone viewing this document.">Employees Only</button>
<button class="btn btn-success"
- title="Current available to everyone viewing this document, click to restrict to internal employees.">Visible</button>
+ title="Currently available to everyone viewing this document, click to restrict to internal employees.">Visible</button>
</div>
</t>
diff --git a/addons/website_rating/__init__.py b/addons/portal_rating/__init__.py
index 7d34c7c054a..7d34c7c054a 100644
--- a/addons/website_rating/__init__.py
+++ b/addons/portal_rating/__init__.py
diff --git a/addons/website_rating/__manifest__.py b/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
index 514e3fde3d2..514e3fde3d2 100644
--- a/addons/website_rating/controllers/__init__.py
+++ b/addons/portal_rating/controllers/__init__.py
diff --git a/addons/website_rating/controllers/portal_chatter.py b/addons/portal_rating/controllers/portal_chatter.py
index fb3116bc774..fb3116bc774 100644
--- a/addons/website_rating/controllers/portal_chatter.py
+++ b/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
index 06d1fe06ac1..06d1fe06ac1 100644
--- a/addons/website_rating/controllers/portal_rating.py
+++ b/addons/portal_rating/controllers/portal_rating.py
diff --git a/addons/website_rating/i18n/ar.po b/addons/portal_rating/i18n/ar.po
index 0cde39c2f79..0cde39c2f79 100644
--- a/addons/website_rating/i18n/ar.po
+++ b/addons/portal_rating/i18n/ar.po
diff --git a/addons/website_rating/i18n/az.po b/addons/portal_rating/i18n/az.po
index cd37f9fdef6..cd37f9fdef6 100644
--- a/addons/website_rating/i18n/az.po
+++ b/addons/portal_rating/i18n/az.po
diff --git a/addons/website_rating/i18n/bs.po b/addons/portal_rating/i18n/bs.po
index 84105848c5b..84105848c5b 100644
--- a/addons/website_rating/i18n/bs.po
+++ b/addons/portal_rating/i18n/bs.po
diff --git a/addons/website_rating/i18n/ca.po b/addons/portal_rating/i18n/ca.po
index 95b695608a9..95b695608a9 100644
--- a/addons/website_rating/i18n/ca.po
+++ b/addons/portal_rating/i18n/ca.po
diff --git a/addons/website_rating/i18n/cs.po b/addons/portal_rating/i18n/cs.po
index 220cadfdcf1..220cadfdcf1 100644
--- a/addons/website_rating/i18n/cs.po
+++ b/addons/portal_rating/i18n/cs.po
diff --git a/addons/website_rating/i18n/da.po b/addons/portal_rating/i18n/da.po
index 57e60c09bc8..57e60c09bc8 100644
--- a/addons/website_rating/i18n/da.po
+++ b/addons/portal_rating/i18n/da.po
diff --git a/addons/website_rating/i18n/de.po b/addons/portal_rating/i18n/de.po
index c5cca7a36f9..c5cca7a36f9 100644
--- a/addons/website_rating/i18n/de.po
+++ b/addons/portal_rating/i18n/de.po
diff --git a/addons/website_rating/i18n/el.po b/addons/portal_rating/i18n/el.po
index f74373436f6..f74373436f6 100644
--- a/addons/website_rating/i18n/el.po
+++ b/addons/portal_rating/i18n/el.po
diff --git a/addons/website_rating/i18n/es.po b/addons/portal_rating/i18n/es.po
index 947f66d1226..947f66d1226 100644
--- a/addons/website_rating/i18n/es.po
+++ b/addons/portal_rating/i18n/es.po
diff --git a/addons/website_rating/i18n/et.po b/addons/portal_rating/i18n/et.po
index 7e0d7578412..7e0d7578412 100644
--- a/addons/website_rating/i18n/et.po
+++ b/addons/portal_rating/i18n/et.po
diff --git a/addons/website_rating/i18n/fa.po b/addons/portal_rating/i18n/fa.po
index 97c25ef5ac9..97c25ef5ac9 100644
--- a/addons/website_rating/i18n/fa.po
+++ b/addons/portal_rating/i18n/fa.po
diff --git a/addons/website_rating/i18n/fi.po b/addons/portal_rating/i18n/fi.po
index cde6d665b67..cde6d665b67 100644
--- a/addons/website_rating/i18n/fi.po
+++ b/addons/portal_rating/i18n/fi.po
diff --git a/addons/website_rating/i18n/fr.po b/addons/portal_rating/i18n/fr.po
index 926eedb4f13..926eedb4f13 100644
--- a/addons/website_rating/i18n/fr.po
+++ b/addons/portal_rating/i18n/fr.po
diff --git a/addons/website_rating/i18n/gu.po b/addons/portal_rating/i18n/gu.po
index c53415523e0..c53415523e0 100644
--- a/addons/website_rating/i18n/gu.po
+++ b/addons/portal_rating/i18n/gu.po
diff --git a/addons/website_rating/i18n/he.po b/addons/portal_rating/i18n/he.po
index 7fb4417b79b..7fb4417b79b 100644
--- a/addons/website_rating/i18n/he.po
+++ b/addons/portal_rating/i18n/he.po
diff --git a/addons/website_rating/i18n/hr.po b/addons/portal_rating/i18n/hr.po
index 706603dc50d..706603dc50d 100644
--- a/addons/website_rating/i18n/hr.po
+++ b/addons/portal_rating/i18n/hr.po
diff --git a/addons/website_rating/i18n/hu.po b/addons/portal_rating/i18n/hu.po
index 1fce52d2325..1fce52d2325 100644
--- a/addons/website_rating/i18n/hu.po
+++ b/addons/portal_rating/i18n/hu.po
diff --git a/addons/website_rating/i18n/id.po b/addons/portal_rating/i18n/id.po
index 9a8032688a0..9a8032688a0 100644
--- a/addons/website_rating/i18n/id.po
+++ b/addons/portal_rating/i18n/id.po
diff --git a/addons/website_rating/i18n/is.po b/addons/portal_rating/i18n/is.po
index b343852b68b..b343852b68b 100644
--- a/addons/website_rating/i18n/is.po
+++ b/addons/portal_rating/i18n/is.po
diff --git a/addons/website_rating/i18n/it.po b/addons/portal_rating/i18n/it.po
index 8e21447b75e..8e21447b75e 100644
--- a/addons/website_rating/i18n/it.po
+++ b/addons/portal_rating/i18n/it.po
diff --git a/addons/website_rating/i18n/ja.po b/addons/portal_rating/i18n/ja.po
index daced4944e6..daced4944e6 100644
--- a/addons/website_rating/i18n/ja.po
+++ b/addons/portal_rating/i18n/ja.po
diff --git a/addons/website_rating/i18n/km.po b/addons/portal_rating/i18n/km.po
index 66aaf93b7f3..66aaf93b7f3 100644
--- a/addons/website_rating/i18n/km.po
+++ b/addons/portal_rating/i18n/km.po
diff --git a/addons/website_rating/i18n/ko.po b/addons/portal_rating/i18n/ko.po
index 759facfdb79..759facfdb79 100644
--- a/addons/website_rating/i18n/ko.po
+++ b/addons/portal_rating/i18n/ko.po
diff --git a/addons/website_rating/i18n/lb.po b/addons/portal_rating/i18n/lb.po
index 3e976ca2f53..3e976ca2f53 100644
--- a/addons/website_rating/i18n/lb.po
+++ b/addons/portal_rating/i18n/lb.po
diff --git a/addons/website_rating/i18n/lt.po b/addons/portal_rating/i18n/lt.po
index 5a9c0644662..5a9c0644662 100644
--- a/addons/website_rating/i18n/lt.po
+++ b/addons/portal_rating/i18n/lt.po
diff --git a/addons/website_rating/i18n/lv.po b/addons/portal_rating/i18n/lv.po
index a8763af7f2a..a8763af7f2a 100644
--- a/addons/website_rating/i18n/lv.po
+++ b/addons/portal_rating/i18n/lv.po
diff --git a/addons/website_rating/i18n/mn.po b/addons/portal_rating/i18n/mn.po
index 784e6b95c75..784e6b95c75 100644
--- a/addons/website_rating/i18n/mn.po
+++ b/addons/portal_rating/i18n/mn.po
diff --git a/addons/website_rating/i18n/nb.po b/addons/portal_rating/i18n/nb.po
index 48015456e46..48015456e46 100644
--- a/addons/website_rating/i18n/nb.po
+++ b/addons/portal_rating/i18n/nb.po
diff --git a/addons/website_rating/i18n/nl.po b/addons/portal_rating/i18n/nl.po
index 8ff1e99977f..8ff1e99977f 100644
--- a/addons/website_rating/i18n/nl.po
+++ b/addons/portal_rating/i18n/nl.po
diff --git a/addons/website_rating/i18n/pl.po b/addons/portal_rating/i18n/pl.po
index b347a984299..b347a984299 100644
--- a/addons/website_rating/i18n/pl.po
+++ b/addons/portal_rating/i18n/pl.po
diff --git a/addons/website_rating/i18n/pt.po b/addons/portal_rating/i18n/pt.po
index 4352e47ac8f..4352e47ac8f 100644
--- a/addons/website_rating/i18n/pt.po
+++ b/addons/portal_rating/i18n/pt.po
diff --git a/addons/website_rating/i18n/pt_BR.po b/addons/portal_rating/i18n/pt_BR.po
index b3abaccece5..b3abaccece5 100644
--- a/addons/website_rating/i18n/pt_BR.po
+++ b/addons/portal_rating/i18n/pt_BR.po
diff --git a/addons/website_rating/i18n/ro.po b/addons/portal_rating/i18n/ro.po
index 4ec9dc4ad50..4ec9dc4ad50 100644
--- a/addons/website_rating/i18n/ro.po
+++ b/addons/portal_rating/i18n/ro.po
diff --git a/addons/website_rating/i18n/ru.po b/addons/portal_rating/i18n/ru.po
index 93366d62477..93366d62477 100644
--- a/addons/website_rating/i18n/ru.po
+++ b/addons/portal_rating/i18n/ru.po
diff --git a/addons/website_rating/i18n/sk.po b/addons/portal_rating/i18n/sk.po
index ce9d2495e61..ce9d2495e61 100644
--- a/addons/website_rating/i18n/sk.po
+++ b/addons/portal_rating/i18n/sk.po
diff --git a/addons/website_rating/i18n/sl.po b/addons/portal_rating/i18n/sl.po
index ca75705c705..ca75705c705 100644
--- a/addons/website_rating/i18n/sl.po
+++ b/addons/portal_rating/i18n/sl.po
diff --git a/addons/website_rating/i18n/sr.po b/addons/portal_rating/i18n/sr.po
index 1cc69b650ec..1cc69b650ec 100644
--- a/addons/website_rating/i18n/sr.po
+++ b/addons/portal_rating/i18n/sr.po
diff --git a/addons/website_rating/i18n/sr@latin.po b/addons/portal_rating/i18n/sr@latin.po
index 377ee2fe21d..377ee2fe21d 100644
--- a/addons/website_rating/i18n/sr@latin.po
+++ b/addons/portal_rating/i18n/sr@latin.po
diff --git a/addons/website_rating/i18n/sv.po b/addons/portal_rating/i18n/sv.po
index 8b642b1f2e7..8b642b1f2e7 100644
--- a/addons/website_rating/i18n/sv.po
+++ b/addons/portal_rating/i18n/sv.po
diff --git a/addons/website_rating/i18n/th.po b/addons/portal_rating/i18n/th.po
index 6bf13fc9aab..6bf13fc9aab 100644
--- a/addons/website_rating/i18n/th.po
+++ b/addons/portal_rating/i18n/th.po
diff --git a/addons/website_rating/i18n/tr.po b/addons/portal_rating/i18n/tr.po
index 64b7572a647..64b7572a647 100644
--- a/addons/website_rating/i18n/tr.po
+++ b/addons/portal_rating/i18n/tr.po
diff --git a/addons/website_rating/i18n/uk.po b/addons/portal_rating/i18n/uk.po
index 81ab5639db7..81ab5639db7 100644
--- a/addons/website_rating/i18n/uk.po
+++ b/addons/portal_rating/i18n/uk.po
diff --git a/addons/website_rating/i18n/vi.po b/addons/portal_rating/i18n/vi.po
index da735c3bf16..da735c3bf16 100644
--- a/addons/website_rating/i18n/vi.po
+++ b/addons/portal_rating/i18n/vi.po
diff --git a/addons/website_rating/i18n/website_rating.pot b/addons/portal_rating/i18n/website_rating.pot
index 1f28df3a669..1f28df3a669 100644
--- a/addons/website_rating/i18n/website_rating.pot
+++ b/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
index be2b95b8dc4..be2b95b8dc4 100644
--- a/addons/website_rating/i18n/zh_CN.po
+++ b/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
index c44bf076556..c44bf076556 100644
--- a/addons/website_rating/i18n/zh_TW.po
+++ b/addons/portal_rating/i18n/zh_TW.po
diff --git a/addons/website_rating/models/__init__.py b/addons/portal_rating/models/__init__.py
index 3404de196ed..3404de196ed 100644
--- a/addons/website_rating/models/__init__.py
+++ b/addons/portal_rating/models/__init__.py
diff --git a/addons/website_rating/models/mail_message.py b/addons/portal_rating/models/mail_message.py
index 9f2be5d1a25..9f2be5d1a25 100644
--- a/addons/website_rating/models/mail_message.py
+++ b/addons/portal_rating/models/mail_message.py
diff --git a/addons/website_rating/models/rating.py b/addons/portal_rating/models/rating.py
index bea77a45de9..bea77a45de9 100644
--- a/addons/website_rating/models/rating.py
+++ b/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
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
index a54f416cd7f..a54f416cd7f 100644
--- a/addons/website_rating/static/src/js/portal_composer.js
+++ b/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
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
index 4c2a70495fe..4c2a70495fe 100644
--- a/addons/website_rating/static/src/scss/website_rating.scss
+++ b/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
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 @@
<attribute name="t-attf-action">#{widget.options['force_submit_url'] ? widget.options['force_submit_url'] : '/mail/chatter_post'}</attribute>
</t>
<t t-jquery=".o_portal_chatter_composer_form input[name='csrf_token']" t-operation="after">
- <t t-call="website_rating.rating_star_input">
+ <t t-call="portal_rating.rating_star_input">
<t t-set="default_rating" t-value="widget.options['default_rating_value']"/>
</t>
<input type="hidden" name="message_id" t-att-value="widget.options['default_message_id']" t-if="widget.options['default_message_id']"/>
@@ -19,7 +19,7 @@
<t t-extend="portal.chatter_messages">
<t t-jquery="t[t-raw='message.body']" t-operation="before">
<t t-if="message['rating_value']">
- <t t-call="website_rating.rating_stars_static">
+ <t t-call="portal_rating.rating_stars_static">
<t t-set="val" t-value="message.rating_value"/>
</t>
</t>
@@ -28,7 +28,7 @@
<!--Only possible if a rating is link to the message, for now we can't comment if no rating
is link to the message (because publisher comment data
is on the rating.rating model - one comment max) -->
- <t t-if="message.rating and message.rating.id" t-call="website_rating.chatter_rating_publisher">
+ <t t-if="message.rating and message.rating.id" t-call="portal_rating.chatter_rating_publisher">
<t t-set="is_publisher" t-value="widget.options['is_user_publisher']"/>
<t t-set="rating" t-value="message.rating"/>
</t>
@@ -38,7 +38,7 @@
<t t-extend="portal.Chatter">
<t t-jquery="t[t-call='portal.chatter_message_count']" t-operation="replace">
<t t-if="widget.options['display_rating']">
- <t t-call="website_rating.rating_card"/>
+ <t t-call="portal_rating.rating_card"/>
</t>
<t t-if="!widget.options['display_rating']">
<t t-call="portal.chatter_message_count"/>
@@ -49,7 +49,7 @@
<!--
New templates specific of rating in Chatter
-->
- <t t-name="website_rating.chatter_rating_publisher">
+ <t t-name="portal_rating.chatter_rating_publisher">
<div class="o_wrating_publisher_container">
<button t-if="is_publisher"
t-attf-class="btn px-2 btn-sm border o_wrating_js_publisher_comment_btn {{ rating.publisher_comment !== '' ? 'd-none' : '' }}"
@@ -57,12 +57,12 @@
<i class="fa fa-comment text-muted mr-1"/>Comment
</button>
<div class="o_wrating_publisher_comment mt-2 mb-2">
- <t t-if="rating.publisher_comment" t-call="website_rating.chatter_rating_publisher_comment"/>
+ <t t-if="rating.publisher_comment" t-call="portal_rating.chatter_rating_publisher_comment"/>
</div>
</div>
</t>
- <t t-name="website_rating.chatter_rating_publisher_comment">
+ <t t-name="portal_rating.chatter_rating_publisher_comment">
<div class="media o_portal_chatter_message">
<img class="o_portal_chatter_avatar" t-att-src="rating.publisher_avatar" alt="avatar"/>
<div class="media-body">
@@ -89,7 +89,7 @@
</div>
</div>
</t>
- <t t-name="website_rating.chatter_rating_publisher_form">
+ <t t-name="portal_rating.chatter_rating_publisher_form">
<div t-if="is_publisher" class="media o_portal_chatter_message shadow bg-white rounded px-3 py-3 my-1">
<img class="o_portal_chatter_avatar" t-att-src="rating.publisher_avatar" alt="avatar"/>
<div class="media-body">
diff --git a/addons/website_rating/static/src/xml/portal_rating_composer.xml b/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
-->
- <t t-name="website_rating.PopupComposer">
+ <t t-name="portal_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-call="portal_rating.rating_stars_static">
<t t-set="val" t-value="widget.rating_avg || 0"/>
<t t-set="inline_mode" t-value="true"/>
</t>
diff --git a/addons/website_rating/static/src/xml/portal_tools.xml b/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 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates id="template" xml:space="preserve">
- <t t-name="website_rating.rating_stars_static">
+ <t t-name="portal_rating.rating_stars_static">
<t t-set="val_integer" t-value="Math.floor(val)"/>
<t t-set="val_decimal" t-value="val - val_integer"/>
<t t-set="empty_star" t-value="5 - (val_integer+Math.ceil(val_decimal))"/>
@@ -17,13 +17,13 @@
</div>
</t>
- <t t-name="website_rating.rating_card">
+ <t t-name="portal_rating.rating_card">
<div class="row o_website_rating_card_container">
<div class="col-lg-3 offset-lg-2" t-if="!_.isEmpty(widget.get('rating_card_values'))">
<p><strong>Average</strong></p>
<div class="o_website_rating_avg text-center">
<h1><t t-esc="widget.get('rating_card_values')['avg']"/></h1>
- <t t-call="website_rating.rating_stars_static">
+ <t t-call="portal_rating.rating_stars_static">
<t t-set="val" t-value="widget.get('rating_card_values')['avg'] || 0"/>
</t>
<t t-call="portal.chatter_message_count"/>
@@ -61,7 +61,7 @@
</div>
</t>
- <t t-name="website_rating.rating_star_input">
+ <t t-name="portal_rating.rating_star_input">
<div class="o_rating_star_card" t-if="widget.options['display_rating']">
<t t-set="val_integer" t-value="Math.floor(default_rating)"/>
<t t-set="val_decimal" t-value="default_rating - val_integer"/>
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 @@
+<?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="/portal_rating/static/src/scss/portal_rating.scss"/>
+ </xpath>
+ <xpath expr="//script[last()]" position="after">
+ <script type="text/javascript" src="/portal_rating/static/src/js/portal_chatter.js"></script>
+ <script type="text/javascript" src="/portal_rating/static/src/js/portal_composer.js"></script>
+ <script type="text/javascript" src="/portal_rating/static/src/js/portal_rating_composer.js"></script>
+ </xpath>
+ </template>
+</odoo>
diff --git a/addons/website_rating/views/portal_templates.xml b/addons/portal_rating/views/portal_templates.xml
index d616bc491c9..d616bc491c9 100644
--- a/addons/website_rating/views/portal_templates.xml
+++ b/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
index 1e88fffcbf4..1e88fffcbf4 100644
--- a/addons/website_rating/views/rating_templates.xml
+++ b/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
index 2a9e5bf0866..2a9e5bf0866 100644
--- a/addons/website_rating/views/rating_views.xml
+++ b/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 @@
-<?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_composer.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_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 @@
</div>
</div>
<div class="d-flex flex-column justify-content-center h5 flex-grow-1 mb-md-5" t-if="channel.allow_comment">
- <t t-call="website_rating.rating_stars_static_popup_composer">
+ <t t-call="portal_rating.rating_stars_static_popup_composer">
<t t-set="btn_classes" t-value="'btn-warning'"/>
<t t-set="rating_avg" t-value="rating_avg"/>
<t t-set="rating_total" t-value="rating_count"/>