Thibault Delavallée
1838191eec
Purpose of this commit is to correctly compute author_id and email_from in mail_message and mail_mail as they depends from each other. Moreover it is a good idea in various flows to specify email and author when giving creation values to avoid default computation that is not always guaranteed to be accurate notably when involving super user. Mail message creation could lead to desynchronized values between author and email_from. This is improved with this commit by correctly inheriting from default_get and computing both of them at the same time instead of having two default values. Indeed they depend on each other. Same thing is done for mail composer. Mail Thread offers a tool method to find email_from / author_id based on having one of those values or current user and it is called whenever necessary. Some calls to mail template send_mail are also cleaned. Task ID 1853147 PR #32243
91 lines
4.7 KiB
Python
91 lines
4.7 KiB
Python
# -*- coding: utf-8 -*-
|
|
# Part of Odoo. See LICENSE file for full copyright and licensing details.
|
|
|
|
from lxml import etree
|
|
from lxml.html import builder as html
|
|
|
|
from odoo import _, api, fields, models
|
|
from odoo.exceptions import UserError
|
|
|
|
|
|
class Invite(models.TransientModel):
|
|
""" Wizard to invite partners (or channels) and make them followers. """
|
|
_name = 'mail.wizard.invite'
|
|
_description = 'Invite wizard'
|
|
|
|
@api.model
|
|
def default_get(self, fields):
|
|
result = super(Invite, self).default_get(fields)
|
|
if self._context.get('mail_invite_follower_channel_only'):
|
|
result['send_mail'] = False
|
|
if 'message' not in fields:
|
|
return result
|
|
|
|
user_name = self.env.user.display_name
|
|
model = result.get('res_model')
|
|
res_id = result.get('res_id')
|
|
if model and res_id:
|
|
document = self.env['ir.model']._get(model).display_name
|
|
title = self.env[model].browse(res_id).display_name
|
|
msg_fmt = _('%(user_name)s invited you to follow %(document)s document: %(title)s')
|
|
else:
|
|
msg_fmt = _('%(user_name)s invited you to follow a new document.')
|
|
|
|
text = msg_fmt % locals()
|
|
message = html.DIV(
|
|
html.P(_('Hello,')),
|
|
html.P(text)
|
|
)
|
|
result['message'] = etree.tostring(message)
|
|
return result
|
|
|
|
res_model = fields.Char('Related Document Model', required=True, index=True, help='Model of the followed resource')
|
|
res_id = fields.Integer('Related Document ID', index=True, help='Id of the followed resource')
|
|
partner_ids = fields.Many2many('res.partner', string='Recipients', help="List of partners that will be added as follower of the current document.")
|
|
channel_ids = fields.Many2many('mail.channel', string='Channels', help='List of channels that will be added as listeners of the current document.',
|
|
domain=[('channel_type', '=', 'channel')])
|
|
message = fields.Html('Message')
|
|
send_mail = fields.Boolean('Send Email', default=True, help="If checked, the partners will receive an email warning they have been added in the document's followers.")
|
|
|
|
def add_followers(self):
|
|
if not self.env.user.email:
|
|
raise UserError(_("Unable to post message, please configure the sender's email address."))
|
|
email_from = self.env.user.email_formatted
|
|
for wizard in self:
|
|
Model = self.env[wizard.res_model]
|
|
document = Model.browse(wizard.res_id)
|
|
|
|
# filter partner_ids to get the new followers, to avoid sending email to already following partners
|
|
new_partners = wizard.partner_ids - document.message_partner_ids
|
|
new_channels = wizard.channel_ids - document.message_channel_ids
|
|
document.message_subscribe(new_partners.ids, new_channels.ids)
|
|
|
|
model_name = self.env['ir.model']._get(wizard.res_model).display_name
|
|
# send an email if option checked and if a message exists (do not send void emails)
|
|
if wizard.send_mail and wizard.message and not wizard.message == '<br>': # when deleting the message, cleditor keeps a <br>
|
|
message = self.env['mail.message'].create({
|
|
'subject': _('Invitation to follow %s: %s') % (model_name, document.display_name),
|
|
'body': wizard.message,
|
|
'record_name': document.display_name,
|
|
'email_from': email_from,
|
|
'reply_to': email_from,
|
|
'model': wizard.res_model,
|
|
'res_id': wizard.res_id,
|
|
'no_auto_thread': True,
|
|
'add_sign': True,
|
|
})
|
|
partners_data = []
|
|
recipient_data = self.env['mail.followers']._get_recipient_data(document, 'comment', False, pids=new_partners.ids)
|
|
for pid, cid, active, pshare, ctype, notif, groups in recipient_data:
|
|
pdata = {'id': pid, 'share': pshare, 'active': active, 'notif': 'email', 'groups': groups or []}
|
|
if not pshare and notif: # has an user and is not shared, is therefore user
|
|
partners_data.append(dict(pdata, type='user'))
|
|
elif pshare and notif: # has an user and is shared, is therefore portal
|
|
partners_data.append(dict(pdata, type='portal'))
|
|
else: # has no user, is therefore customer
|
|
partners_data.append(dict(pdata, type='customer'))
|
|
|
|
document._notify_record_by_email(message, {'partners': partners_data, 'channels': []}, send_after_commit=False)
|
|
message.unlink()
|
|
return {'type': 'ir.actions.act_window_close'}
|