From 28169ea7ed854de276de69935595e4520d33fa0f Mon Sep 17 00:00:00 2001 From: x620 Date: Wed, 6 Apr 2016 17:53:40 +0500 Subject: [PATCH] [REF] add "sent" parameter in data and simplify set_channel_flags() method in sent.js --- mail_sent/models.py | 9 +++++++++ mail_sent/static/src/js/sent.js | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mail_sent/models.py b/mail_sent/models.py index 16414ed..e7c3995 100644 --- a/mail_sent/models.py +++ b/mail_sent/models.py @@ -16,6 +16,15 @@ class MailMessage(models.Model): and self_sudo.author_id \ and self_sudo.partner_ids[0].id != self_sudo.author_id.id + @api.multi + def message_format(self): + message_values = super(MailMessage, self).message_format() + for message in message_values: + for item in self: + if message['id'] == item.id: + message['sent'] = item.sent + return message_values + class MailComposeMessage(models.TransientModel): _inherit = 'mail.compose.message' diff --git a/mail_sent/static/src/js/sent.js b/mail_sent/static/src/js/sent.js index 8b1d0d6..cd576fb 100644 --- a/mail_sent/static/src/js/sent.js +++ b/mail_sent/static/src/js/sent.js @@ -26,7 +26,7 @@ base_obj.MailTools.include({ set_channel_flags: function(data, msg){ this._super.apply(this, arguments); - if (_.contains(data.author_id, session.partner_id) && data.partner_ids.length > 0) { + if (data.sent) { msg.is_sent = true; } return msg;