Yaltik/social
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] mail_tracking: Repeated suggested cc emails

Browse Source
This commit is contained in:
Alexandre Díaz 2019-07-22 17:07:50 +02:00 committed by Jasmin Solanki
parent 7c1a8f25dc
commit ef83aacf9a
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mail_tracking/models/mail_thread.py
View File

@ -24,19 +24,21 @@ class MailThread(models.AbstractModel):
def message_get_suggested_recipients(self): def message_get_suggested_recipients(self):
res = super().message_get_suggested_recipients() res = super().message_get_suggested_recipients()
ResPartnerObj = self.env['res.partner'] ResPartnerObj = self.env['res.partner']
email_cc_formated_list = []
for record in self: for record in self:
messages = record.message_ids.filtered('email_cc') emails_cc = record.message_ids.mapped('email_cc')
for msg in messages: for email in emails_cc:
email_cc_list = email_split_and_format(msg.email_cc) email_cc_formated_list.extend(email_split_and_format(email))
for cc in email_cc_list: email_cc_formated_list = set(email_cc_formated_list)
for cc in email_cc_formated_list:
email_parts = getaddresses([cc])[0] email_parts = getaddresses([cc])[0]
partner_id = record.message_partner_info_from_emails( partner_id = record.message_partner_info_from_emails(
[email_parts[1]])[0].get('partner_id') [email_parts[1]])[0].get('partner_id')
if not partner_id: if not partner_id:
res[record.id].append((False, cc, _('Cc'))) record._message_add_suggested_recipient(
res, email=cc, reason=_('Cc'))
else: else:
partner = ResPartnerObj.browse(partner_id, partner = ResPartnerObj.browse(partner_id, self._prefetch)
self._prefetch)
record._message_add_suggested_recipient( record._message_add_suggested_recipient(
res, partner=partner, reason=_('Cc')) res, partner=partner, reason=_('Cc'))
return res return res

15
mail_tracking/tests/test_mail_tracking.py
View File

@ -140,6 +140,21 @@ class TestMailTracking(TransactionCase):
recipients = self.recipient.message_get_suggested_recipients() recipients = self.recipient.message_get_suggested_recipients()
self.assertEqual(recipients[self.recipient.id][0][1], self.assertEqual(recipients[self.recipient.id][0][1],
'unnamed@test.com') 'unnamed@test.com')
self.assertEqual(len(recipients[self.recipient.id][0]), 3)
# Repeated Cc recipients
message = self.env['mail.message'].create({
'subject': 'Message test',
'author_id': self.sender.id,
'email_from': self.sender.email,
'message_type': 'comment',
'model': 'res.partner',
'res_id': self.recipient.id,
'partner_ids': [(4, self.recipient.id)],
'email_cc': 'unnamed@test.com, sender@example.com',
'body': '<p>This is another test message</p>',
})
recipients = self.recipient.message_get_suggested_recipients()
self.assertEqual(len(recipients[self.recipient.id][0]), 3)
def mail_send(self, recipient): def mail_send(self, recipient):
mail = self.env['mail.mail'].create({ mail = self.env['mail.mail'].create({