summaryrefslogtreecommitdiff
path: root/addons/website_mail/models
diff options
context:
space:
mode:
authorJérome Maes <jem@openerp.com>2017-08-09 13:09:32 +0200
committerJérome Maes <jem@openerp.com>2017-08-16 14:56:40 +0200
commit3cfd64f63f6153c170c9c876fa65976a95da22cb (patch)
treedcd477f6e8225ed788fa38484fc28272e77073bb /addons/website_mail/models
parent2972976962617d4b8a0113bae58c640ab41cdff8 (diff)
[MOV] portal,website_mail: move chatter frontend to portal
This split responsiblilies : - portal provides basic chatter for portal document, and website documents (slides, blog, ...). - website_mail provides comments moderation (unpublished mail message) - website_rating integrate rating when posting comments
Diffstat (limited to 'addons/website_mail/models')
-rw-r--r--addons/website_mail/models/__init__.py1
-rw-r--r--addons/website_mail/models/mail_message.py15
-rw-r--r--addons/website_mail/models/mail_thread.py12
3 files changed, 4 insertions, 24 deletions
diff --git a/addons/website_mail/models/__init__.py b/addons/website_mail/models/__init__.py
index e90621e2bd2..75ea63bd6d8 100644
--- a/addons/website_mail/models/__init__.py
+++ b/addons/website_mail/models/__init__.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from . import mail_thread
from . import mail_message
from . import update
diff --git a/addons/website_mail/models/mail_message.py b/addons/website_mail/models/mail_message.py
index f1ebde86c2a..34609160f1d 100644
--- a/addons/website_mail/models/mail_message.py
+++ b/addons/website_mail/models/mail_message.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import api, fields, models, SUPERUSER_ID, _
+from odoo import api, fields, models, _
from odoo.osv import expression
from odoo.tools import html2plaintext
from odoo.exceptions import AccessError
@@ -58,13 +58,6 @@ class MailMessage(models.Model):
return super(MailMessage, self).check_access_rule(operation=operation)
@api.multi
- def website_message_format(self):
- message_values = self.read([
- 'id', 'body', 'date', 'author_id', 'email_from', # base message fields
- 'message_type', 'subtype_id', 'subject', # message specific
- 'model', 'res_id', 'record_name', # document related
- 'website_published',
- ])
- message_tree = dict((m.id, m) for m in self.sudo())
- self._message_read_dict_postprocess(message_values, message_tree)
- return message_values
+ def _portal_message_format(self, fields_list):
+ fields_list += ['website_published']
+ return super(MailMessage, self)._portal_message_format(fields_list)
diff --git a/addons/website_mail/models/mail_thread.py b/addons/website_mail/models/mail_thread.py
deleted file mode 100644
index 08cd54aa301..00000000000
--- a/addons/website_mail/models/mail_thread.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-from odoo import api, fields, models
-
-
-class MailThread(models.AbstractModel):
- _inherit = 'mail.thread'
-
- website_message_ids = fields.One2many('mail.message', 'res_id', string='Website Messages',
- domain=lambda self: [('model', '=', self._name), ('message_type', '=', 'comment')], auto_join=True,
- help="Website communication history")