"/
+ """
+ _records = self if self and self._name != 'mail.thread' else records
+ model = _records._name if _records and _records._name != 'mail.thread' else False
+ res_ids = _records.ids if _records and model else []
+ _res_ids = res_ids or [False] # always have a default value located in False
+
+ alias_domain = self.env['ir.config_parameter'].sudo().get_param("mail.catchall.domain")
+ result = dict.fromkeys(_res_ids, False)
+ result_email = dict()
+ doc_names = doc_names if doc_names else dict()
+
+ if alias_domain:
+ if model and res_ids:
+ if not doc_names:
+ doc_names = dict((rec.id, rec.display_name) for rec in _records)
+
+ mail_aliases = self.env['mail.alias'].sudo().search([
+ ('alias_parent_model_id.model', '=', model),
+ ('alias_parent_thread_id', 'in', res_ids),
+ ('alias_name', '!=', False)])
+ # take only first found alias for each thread_id, to match order (1 found -> limit=1 for each res_id)
+ for alias in mail_aliases:
+ result_email.setdefault(alias.alias_parent_thread_id, '%s@%s' % (alias.alias_name, alias_domain))
+
+ # left ids: use catchall
+ left_ids = set(_res_ids) - set(result_email)
+ if left_ids:
+ catchall = self.env['ir.config_parameter'].sudo().get_param("mail.catchall.alias")
+ if catchall:
+ result_email.update(dict((rid, '%s@%s' % (catchall, alias_domain)) for rid in left_ids))
+
+ # compute name of reply-to - TDE tocheck: quotes and stuff like that
+ company_name = company.name if company else self.env.company.name
+ for res_id in result_email.keys():
+ name = '%s%s%s' % (company_name, ' ' if doc_names.get(res_id) else '', doc_names.get(res_id, ''))
+ result[res_id] = formataddr((name, result_email[res_id]))
+
+ left_ids = set(_res_ids) - set(result_email)
+ if left_ids:
+ result.update(dict((res_id, default) for res_id in left_ids))
+
+ return result
+
+ @api.model
+ def _notify_get_reply_to_on_records(self, default=None, records=None, company=None, doc_names=None):
+ """ Generic wrapper on ``_notify_get_reply_to`` checking mail.thread inheritance
+ and allowing to call model-specific implementation in a one liner. This
+ method should not be overridden. """
+ if records and hasattr(records, '_notify_get_reply_to'):
+ return records._notify_get_reply_to(default=default, company=company, doc_names=doc_names)
+ return self._notify_get_reply_to(default=default, records=records, company=company, doc_names=doc_names)
+
+ @api.multi
+ def _notify_email_recipient_values(self, recipient_ids):
+ """ Format email notification recipient values to store on the notification
+ mail.mail. Basic method just set the recipient partners as mail_mail
+ recipients. Override to generate other mail values like email_to or
+ email_cc.
+ :param recipient_ids: res.partner recordset to notify
+ """
+ return {
+ 'email_to': False,
+ 'recipient_ids': recipient_ids,
+ }
+ @api.multi
+ def _notify_customize_recipients(self, message, msg_vals):
+ return {}
+
# ------------------------------------------------------
# Followers API
# ------------------------------------------------------
@@ -2306,19 +2620,16 @@ class MailThread(models.AbstractModel):
:param default_subtype_ids: coming from ``_get_auto_subscription_subtypes``
"""
fnames = []
- for name, field in self._fields.items():
- if name == 'user_id' and updated_values.get(name) and (getattr(field, 'track_visibility', False) or getattr(field, 'tracking', False)):
- if field.comodel_name == 'res.users':
- fnames.append(name)
-
- new_subscriptions = []
- user_ids = [updated_values[fname] for fname in fnames if updated_values[fname]]
- if user_ids:
- new_pids = self.env['res.partner'].sudo().search([('user_ids', 'in', user_ids), ('active', '=', True)]).ids
- for new_pid in new_pids:
- new_subscriptions.append((new_pid, default_subtype_ids, 'mail.message_user_assigned' if new_pid != self.env.user.partner_id.id else False))
-
- return new_subscriptions
+ field = self._fields.get('user_id')
+ user_id = updated_values.get('user_id')
+ if field and user_id and field.comodel_name == 'res.users' and (getattr(field, 'track_visibility', False) or getattr(field, 'tracking', False)):
+ user = self.env['res.users'].sudo().browse(user_id)
+ try: # avoid to make an exists, lets be optimistic and try to read it.
+ if user.active:
+ return [(user.partner_id.id, default_subtype_ids, 'mail.message_user_assigned' if user != self.env.user else False)]
+ except:
+ pass
+ return []
@api.multi
def _message_auto_subscribe_notify(self, partner_ids, template):
@@ -2349,9 +2660,9 @@ class MailThread(models.AbstractModel):
record.message_notify(
subject=_('You have been assigned to %s') % record.display_name,
body=assignation_msg,
- partner_ids=[(4, pid) for pid in partner_ids],
+ partner_ids=partner_ids,
record_name=record.display_name,
- notif_layout='mail.mail_notification_light',
+ email_layout_xmlid='mail.mail_notification_light',
model_description=model_description,
)
@@ -2419,6 +2730,10 @@ class MailThread(models.AbstractModel):
return True
+ # ------------------------------------------------------
+ # Controllers
+ # ------------------------------------------------------
+
def _get_mail_redirect_suggested_company(self):
""" Return the suggested company to be set on the context
in case of a mail redirection to the record. To avoid multi
diff --git a/addons/mail/models/models.py b/addons/mail/models/models.py
index 4c85b08d2af..e15bad70166 100644
--- a/addons/mail/models/models.py
+++ b/addons/mail/models/models.py
@@ -17,3 +17,18 @@ class BaseModel(models.AbstractModel):
activity_box = E.div(field, {'t-name': "activity-box"})
templates = E.templates(activity_box)
return E.activity(templates, string=self._description)
+
+ @api.multi
+ def _notify_email_headers(self):
+ """
+ Generate the email headers based on record
+ """
+ if not self:
+ return {}
+ self.ensure_one()
+ return repr(self._notify_email_header_dict())
+
+ def _notify_email_header_dict(self):
+ return {
+ 'X-Odoo-Objects': "%s-%s" % (self._name, self.id),
+ }
diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py
index 966d0bb2dbd..e2abaf7d75b 100644
--- a/addons/mail/models/res_partner.py
+++ b/addons/mail/models/res_partner.py
@@ -2,11 +2,8 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
import logging
-import threading
-from odoo.tools.misc import split_every
-
-from odoo import _, api, fields, models, registry, SUPERUSER_ID
+from odoo import _, api, fields, models
from odoo.addons.bus.models.bus_presence import AWAY_TIMER
from odoo.addons.bus.models.bus_presence import DISCONNECTION_TIMER
from odoo.osv import expression
@@ -40,176 +37,6 @@ class Partner(models.Model):
'email_cc': False}
for r in self}
- @api.model
- def _notify_prepare_template_context(self, message, record, model_description=False, mail_auto_delete=True):
- # compute send user and its related signature
- signature = ''
- if message.author_id and message.author_id.user_ids:
- user = message.author_id.user_ids[0]
- if message.add_sign:
- signature = user.signature
- else:
- user = self.env.user
- if message.add_sign:
- signature = "--
%s
" % message.author_id.name
-
- company = record.company_id.sudo() if record and 'company_id' in record else user.company_id
- if company.website:
- website_url = 'http://%s' % company.website if not company.website.lower().startswith(('http:', 'https:')) else company.website
- else:
- website_url = False
-
- # Retrieve the language in which the template was rendered, in order to render the custom
- # layout in the same language.
- lang = self.env.context.get('lang')
- if {'default_template_id', 'default_model', 'default_res_id'} <= self.env.context.keys():
- template = self.env['mail.template'].browse(self.env.context['default_template_id'])
- if template and template.lang:
- lang = template._render_template(template.lang, self.env.context['default_model'], self.env.context['default_res_id'])
-
- if not model_description and message.model:
- model_description = self.env['ir.model'].with_context(lang=lang)._get(message.model).display_name
-
- tracking = []
- for tracking_value in self.env['mail.tracking.value'].sudo().search([('mail_message_id', '=', message.id)]):
- groups = tracking_value.field_groups
- if not groups or self.user_has_groups(groups):
- tracking.append((tracking_value.field_desc,
- tracking_value.get_old_display_value()[0],
- tracking_value.get_new_display_value()[0]))
-
- is_discussion = message.subtype_id.id == self.env['ir.model.data'].xmlid_to_res_id('mail.mt_comment')
-
- return {
- 'message': message,
- 'signature': signature,
- 'website_url': website_url,
- 'company': company,
- 'model_description': model_description,
- 'record': record,
- 'record_name': message.record_name,
- 'tracking_values': tracking,
- 'is_discussion': is_discussion,
- 'subtype': message.subtype_id,
- 'lang': lang,
- }
-
- @api.model
- def _notify(self, message, rdata, record, force_send=False, send_after_commit=True, model_description=False, mail_auto_delete=True):
- """ Method to send email linked to notified messages. The recipients are
- the recordset on which this method is called.
-
- :param message: mail.message record to notify;
- :param rdata: recipient data (see mail.message _notify);
- :param record: optional record on which the message was posted;
- :param force_send: tells whether to send notification emails within the
- current transaction or to use the email queue;
- :param send_after_commit: if force_send, tells whether to send emails after
- the transaction has been committed using a post-commit hook;
- :param model_description: optional data used in notification process (see
- notification templates);
- :param mail_auto_delete: delete notification emails once sent;
- """
- if not rdata:
- return True
-
- base_template_ctx = self._notify_prepare_template_context(message, record, model_description=model_description)
- template_xmlid = message.layout if message.layout else 'mail.message_notification_email'
- try:
- base_template = self.env.ref(template_xmlid, raise_if_not_found=True).with_context(lang=base_template_ctx['lang'])
- except ValueError:
- _logger.warning('QWeb template %s not found when sending notification emails. Sending without layouting.' % (template_xmlid))
- base_template = False
-
- # prepare notification mail values
- base_mail_values = {
- 'mail_message_id': message.id,
- 'mail_server_id': message.mail_server_id.id,
- 'auto_delete': mail_auto_delete,
- 'references': message.parent_id.message_id if message.parent_id else False
- }
- if record:
- base_mail_values.update(self.env['mail.thread']._notify_specific_email_values_on_records(message, records=record))
-
- # classify recipients: actions / no action
- recipients = self.env['mail.thread']._notify_classify_recipients_on_records(message, rdata, records=record)
-
- Mail = self.env['mail.mail'].sudo()
- emails = self.env['mail.mail'].sudo()
- email_pids = set()
- recipients_nbr, recipients_max = 0, 50
- for group_tpl_values in [group for group in recipients.values() if group['recipients']]:
- # generate notification email content
- template_ctx = {**base_template_ctx, **group_tpl_values}
- mail_body = base_template.render(template_ctx, engine='ir.qweb', minimal_qcontext=True)
- mail_body = self.env['mail.thread']._replace_local_links(mail_body)
- mail_subject = message.subject or (message.record_name and 'Re: %s' % message.record_name)
-
- # send email
- for email_chunk in split_every(50, group_tpl_values['recipients']):
- recipient_values = self.env['mail.thread']._notify_email_recipients_on_records(message, email_chunk, records=record)
- create_values = {
- 'body_html': mail_body,
- 'subject': mail_subject,
- }
- create_values.update(base_mail_values)
- create_values.update(recipient_values)
- recipient_ids = [r[1] for r in create_values.get('recipient_ids', [])]
- email = Mail.create(create_values)
-
- if email and recipient_ids:
- notifications = self.env['mail.notification'].sudo().search([
- ('mail_message_id', '=', email.mail_message_id.id),
- ('res_partner_id', 'in', list(recipient_ids))
- ])
- notifications.write({
- 'is_email': True,
- 'mail_id': email.id,
- 'is_read': True, # handle by email discards Inbox notification
- 'email_status': 'ready',
- })
-
- emails |= email
- email_pids.update(recipient_ids)
-
- # NOTE:
- # 1. for more than 50 followers, use the queue system
- # 2. do not send emails immediately if the registry is not loaded,
- # to prevent sending email during a simple update of the database
- # using the command-line.
- test_mode = getattr(threading.currentThread(), 'testing', False)
- if force_send and len(emails) < recipients_max and \
- (not self.pool._init or test_mode):
- email_ids = emails.ids
- dbname = self.env.cr.dbname
- _context = self._context
-
- def send_notifications():
- db_registry = registry(dbname)
- with api.Environment.manage(), db_registry.cursor() as cr:
- env = api.Environment(cr, SUPERUSER_ID, _context)
- env['mail.mail'].browse(email_ids).send()
-
- # unless asked specifically, send emails after the transaction to
- # avoid side effects due to emails being sent while the transaction fails
- if not test_mode and send_after_commit:
- self._cr.after('commit', send_notifications)
- else:
- emails.send()
-
- return True
-
- @api.multi
- def _notify_by_chat(self, message):
- """ Broadcast the message to all the partner since """
- if not self:
- return
- message_values = message.message_format()[0]
- notifications = []
- for partner in self:
- notifications.append([(self._cr.dbname, 'ir.needaction', partner.id), dict(message_values)])
- self.env['bus.bus'].sendmany(notifications)
-
@api.model
def get_needaction_count(self):
""" compute the number of needaction of the current user """
@@ -294,3 +121,4 @@ class Partner(models.Model):
return self.env.cr.dictfetchall()
else:
return {}
+
diff --git a/addons/mail/static/src/js/models/messages/message.js b/addons/mail/static/src/js/models/messages/message.js
index 2e49975c9d9..73c4ece9025 100644
--- a/addons/mail/static/src/js/models/messages/message.js
+++ b/addons/mail/static/src/js/models/messages/message.js
@@ -368,7 +368,7 @@ var Message = AbstractMessage.extend(Mixins.EventDispatcherMixin, ServicesMixin
* @return {boolean}
*/
isLinkedToDocumentThread: function () {
- return !!(this._documentModel !== 'mail.channel' && this._documentID);
+ return !!(this._documentModel !== 'mail.channel' && this._documentID && this._type !== 'user_notification');
},
/**
* State whether the current user is the author of this message
diff --git a/addons/mail/wizard/invite.py b/addons/mail/wizard/invite.py
index e8d9cbcbda3..5a899e1a7c6 100644
--- a/addons/mail/wizard/invite.py
+++ b/addons/mail/wizard/invite.py
@@ -72,11 +72,13 @@ class Invite(models.TransientModel):
'no_auto_thread': True,
'add_sign': True,
})
- self.env['res.partner'].with_context(auto_delete=True)._notify(
- message,
- [{'id': pid, 'share': True, 'notif': 'email', 'type': 'customer', 'groups': []} for pid in new_partners.ids],
- document,
- force_send=True,
- send_after_commit=False)
+ partners_data = [{
+ 'id': pid,
+ 'share': True,
+ 'notif': 'email',
+ 'type': 'customer',
+ 'groups': []
+ } for pid in new_partners.ids]
+ document._notify_record_by_email(message, partners_data, send_after_commit=False)
message.unlink()
return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py
index 72076826085..1d54406b086 100644
--- a/addons/mail/wizard/mail_compose_message.py
+++ b/addons/mail/wizard/mail_compose_message.py
@@ -184,9 +184,9 @@ class MailComposer(models.TransientModel):
result['model'] = parent.model
if not values.get('res_id'):
result['res_id'] = parent.res_id
- partner_ids = values.get('partner_ids', list()) + [(4, id) for id in parent.partner_ids.ids]
+ partner_ids = values.get('partner_ids', list()) + parent.partner_ids.ids
if self._context.get('is_private') and parent.author_id: # check message is private then add author also in partner list.
- partner_ids += [(4, parent.author_id.id)]
+ partner_ids += [parent.author_id.id]
result['partner_ids'] = partner_ids
elif values.get('model') and values.get('res_id'):
doc_name_get = self.env[values.get('model')].browse(values.get('res_id')).name_get()
@@ -274,14 +274,18 @@ class MailComposer(models.TransientModel):
post_params = dict(
message_type=wizard.message_type,
subtype_id=subtype_id,
- notif_layout=notif_layout,
+ email_layout_xmlid=notif_layout,
add_sign=not bool(wizard.template_id),
mail_auto_delete=wizard.template_id.auto_delete if wizard.template_id else False,
- model_description=model_description,
- **mail_values)
- if ActiveModel._name == 'mail.thread' and wizard.model:
- post_params['model'] = wizard.model
- ActiveModel.browse(res_id).message_post(**post_params)
+ model_description=model_description)
+ post_params.update(mail_values)
+ if ActiveModel._name == 'mail.thread':
+ if wizard.model:
+ post_params['model'] = wizard.model
+ post_params['res_id'] = res_id
+ ActiveModel.message_notify(**post_params)
+ else:
+ ActiveModel.browse(res_id).message_post(**post_params)
if wizard.composition_mode == 'mass_mail':
batch_mails.send(auto_commit=auto_commit)
@@ -332,7 +336,8 @@ class MailComposer(models.TransientModel):
# mass mailing: rendering override wizard static values
if mass_mail_mode and self.model:
- mail_values.update(self.env['mail.thread']._notify_specific_email_values_on_records(False, records=self.env[self.model].browse(res_id)))
+ record = self.env[self.model].browse(res_id)
+ mail_values['headers'] = record._notify_email_headers()
# keep a copy unless specifically requested, reset record name (avoid browsing records)
mail_values.update(notification=not self.auto_delete_message, model=self.model, res_id=res_id, record_name=False)
# auto deletion of mail_mail
@@ -362,7 +367,7 @@ class MailComposer(models.TransientModel):
mail_values.pop('attachments', []),
attachment_ids,
{'model': 'mail.message', 'res_id': 0}
- )
+ )['attachment_ids']
# Filter out the blacklisted records by setting the mail state to cancel -> Used for Mass Mailing stats
if res_id in blacklisted_rec_ids:
mail_values['state'] = 'cancel'
diff --git a/addons/mail/wizard/mail_resend_message.py b/addons/mail/wizard/mail_resend_message.py
index 12255735871..bcff9dc9840 100644
--- a/addons/mail/wizard/mail_resend_message.py
+++ b/addons/mail/wizard/mail_resend_message.py
@@ -63,26 +63,20 @@ class MailResendMessage(models.TransientModel):
notif_to_cancel.sudo().write({'email_status': 'canceled'})
if to_send:
message = wizard.mail_message_id
- record = self.env[message.model].browse(message.res_id) if message.model and message.res_id else None
+ record = self.env[message.model].browse(message.res_id) if message.is_thread_message() else self.env['mail.thread']
- rdata = []
+ email_partners_data = []
for pid, cid, active, pshare, ctype, notif, groups in self.env['mail.followers']._get_recipient_data(None, False, pids=to_send.ids):
if pid and notif == 'email' or not notif:
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
- rdata.append(dict(pdata, type='user'))
+ email_partners_data.append(dict(pdata, type='user'))
elif pshare and notif: # has an user and is shared, is therefore portal
- rdata.append(dict(pdata, type='portal'))
+ email_partners_data.append(dict(pdata, type='portal'))
else: # has no user, is therefore customer
- rdata.append(dict(pdata, type='customer'))
+ email_partners_data.append(dict(pdata, type='customer'))
- self.env['res.partner']._notify(
- message,
- rdata,
- record,
- force_send=True,
- send_after_commit=False
- )
+ record._notify_record_by_email(message, email_partners_data, send_after_commit=False)
self.mail_message_id._notify_failure_update()
return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/mail_bot/models/mail_bot.py b/addons/mail_bot/models/mail_bot.py
index 96a7a1988dc..2e0ab860255 100644
--- a/addons/mail_bot/models/mail_bot.py
+++ b/addons/mail_bot/models/mail_bot.py
@@ -214,7 +214,7 @@ class MailBot(models.AbstractModel):
def _is_bot_pinged(self, values):
odoobot_id = self.env['ir.model.data'].xmlid_to_res_id("base.partner_root")
- return (4, odoobot_id) in values.get('partner_ids', [])
+ return odoobot_id in values.get('partner_ids', [])
def _is_bot_in_private_channel(self, record):
odoobot_id = self.env['ir.model.data'].xmlid_to_res_id("base.partner_root")
diff --git a/addons/mail_bot/models/mail_thread.py b/addons/mail_bot/models/mail_thread.py
index 81e9fa44711..e1be43e7ca2 100644
--- a/addons/mail_bot/models/mail_thread.py
+++ b/addons/mail_bot/models/mail_thread.py
@@ -7,6 +7,6 @@ from odoo import models
class MailThread(models.AbstractModel):
_inherit = 'mail.thread'
- def _message_post_after_hook(self, message, values, model_description=False, mail_auto_delete=True):
- self.env['mail.bot']._apply_logic(self, values)
- return super(MailThread, self)._message_post_after_hook(message, values, model_description=model_description, mail_auto_delete=mail_auto_delete)
+ def _message_post_after_hook(self, message, msg_vals):
+ self.env['mail.bot']._apply_logic(self, msg_vals)
+ return super(MailThread, self)._message_post_after_hook(message, msg_vals)
diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py
index 3c75c7934a3..fda77b95c95 100644
--- a/addons/mass_mailing/controllers/main.py
+++ b/addons/mass_mailing/controllers/main.py
@@ -20,7 +20,7 @@ class MassMailController(http.Controller):
def _log_blacklist_action(self, blacklist_entry, mailing_id, description):
mailing = request.env['mail.mass_mailing'].sudo().browse(mailing_id)
model_display = mailing.mailing_model_id.display_name
- blacklist_entry._message_log(description + " ({})".format(model_display))
+ blacklist_entry._message_log(body=description + " ({})".format(model_display))
@http.route(['/unsubscribe_from_list'], type='http', website=True, multilang=False, auth='public')
def unsubscribe_placeholder_link(self, **post):
diff --git a/addons/mass_mailing/models/mail_thread.py b/addons/mass_mailing/models/mail_thread.py
index 9411d7300c3..4797fdfbff1 100644
--- a/addons/mass_mailing/models/mail_thread.py
+++ b/addons/mass_mailing/models/mail_thread.py
@@ -73,4 +73,4 @@ class MailThread(models.AbstractModel):
if max(stats) > min(stats) + datetime.timedelta(weeks=1):
blacklist_rec = self.env['mail.blacklist'].sudo()._add(email)
blacklist_rec._message_log(
- 'This email has been automatically blacklisted because of too much bounced.')
+ body='This email has been automatically blacklisted because of too much bounced.')
diff --git a/addons/portal/controllers/mail.py b/addons/portal/controllers/mail.py
index 8d1378218a1..e9603edbaa9 100644
--- a/addons/portal/controllers/mail.py
+++ b/addons/portal/controllers/mail.py
@@ -81,11 +81,13 @@ def _message_post_helper(res_model, res_id, message, token='', nosubscribe=True,
kw.pop('attachment_ids', None)
kw.pop('hash', None)
kw.pop('pid', None)
- return record.with_context(mail_create_nosubscribe=nosubscribe).message_post(body=message,
- message_type=kw.pop('message_type', "comment"),
- subtype=kw.pop('subtype', "mt_comment"),
- author_id=author_id,
- **kw)
+ return record.with_context(mail_create_nosubscribe=nosubscribe).message_post(
+ body=message,
+ message_type=kw.pop('message_type', "comment"),
+ subtype=kw.pop('subtype', "mt_comment"),
+ author_id=author_id,
+ **kw
+ )
class PortalChatter(http.Controller):
diff --git a/addons/portal/models/portal_mixin.py b/addons/portal/models/portal_mixin.py
index 343c2b67809..9d085a14efc 100644
--- a/addons/portal/models/portal_mixin.py
+++ b/addons/portal/models/portal_mixin.py
@@ -72,10 +72,10 @@ class PortalMixin(models.AbstractModel):
return '%s?%s' % ('/mail/view' if redirect else self.access_url, url_encode(params))
@api.multi
- def _notify_get_groups(self, message, groups):
+ def _notify_get_groups(self):
access_token = self._portal_ensure_token()
customer = self['partner_id']
-
+ groups = super(PortalMixin, self)._notify_get_groups()
if access_token and customer:
additional_params = {
'access_token': self.access_token,
@@ -88,13 +88,12 @@ class PortalMixin(models.AbstractModel):
'has_button_access': False,
'button_access': {
'url': access_link,
- 'title': _('View %s') % self.env['ir.model']._get(message.model).display_name,
},
})
]
else:
new_group = []
- return super(PortalMixin, self)._notify_get_groups(message, new_group + groups)
+ return new_group + groups
@api.multi
def get_access_action(self, access_uid=None):
diff --git a/addons/portal/wizard/portal_share.py b/addons/portal/wizard/portal_share.py
index 0da5ce44a7b..a4597edbb62 100644
--- a/addons/portal/wizard/portal_share.py
+++ b/addons/portal/wizard/portal_share.py
@@ -58,7 +58,7 @@ class PortalShare(models.TransientModel):
'share_link': share_link},
subject=_("You are invited to access %s" % active_record.display_name),
subtype_id=note.id,
- notif_layout='mail.mail_notification_light',
+ email_layout_xmlid='mail.mail_notification_light',
partner_ids=[(6, 0, partner.ids)])
# when partner not user send individual mail with signup token
for partner in self.partner_ids - partner_ids:
@@ -70,6 +70,6 @@ class PortalShare(models.TransientModel):
'share_link': share_link},
subject=_("You are invited to access %s" % active_record.display_name),
subtype_id=note.id,
- notif_layout='mail.mail_notification_light',
+ email_layout_xmlid='mail.mail_notification_light',
partner_ids=[(6, 0, partner.ids)])
return {'type': 'ir.actions.act_window_close'}
diff --git a/addons/project/models/project.py b/addons/project/models/project.py
index b9c597edd8e..2da62547014 100644
--- a/addons/project/models/project.py
+++ b/addons/project/models/project.py
@@ -792,7 +792,7 @@ class Task(models.Model):
res['stage_id'] = (test_task.stage_id.mail_template_id, {
'auto_delete_message': True,
'subtype_id': self.env['ir.model.data'].xmlid_to_res_id('mail.mt_note'),
- 'notif_layout': 'mail.mail_notification_light'
+ 'email_layout_xmlid': 'mail.mail_notification_light'
})
return res
@@ -812,12 +812,12 @@ class Task(models.Model):
return super(Task, self)._track_subtype(init_values)
@api.multi
- def _notify_get_groups(self, message, groups):
+ def _notify_get_groups(self):
""" Handle project users and managers recipients that can assign
tasks and create new one directly from notification emails. Also give
access button to portal users and portal customers. If they are notified
they should probably have access to the document. """
- groups = super(Task, self)._notify_get_groups(message, groups)
+ groups = super(Task, self)._notify_get_groups()
self.ensure_one()
@@ -836,9 +836,8 @@ class Task(models.Model):
groups = [new_group] + groups
for group_name, group_method, group_data in groups:
- if group_name == 'customer':
- continue
- group_data['has_button_access'] = True
+ if group_name != 'customer':
+ group_data['has_button_access'] = True
return groups
@@ -907,22 +906,17 @@ class Task(models.Model):
return recipients
@api.multi
- def _notify_specific_email_values(self, message):
- res = super(Task, self)._notify_specific_email_values(message)
- try:
- headers = safe_eval(res.get('headers', dict()))
- except Exception:
- headers = {}
+ def _notify_email_header_dict(self):
+ headers = super(Task, self)._notify_email_header_dict()
if self.project_id:
current_objects = [h for h in headers.get('X-Odoo-Objects', '').split(',') if h]
current_objects.insert(0, 'project.project-%s, ' % self.project_id.id)
headers['X-Odoo-Objects'] = ','.join(current_objects)
if self.tag_ids:
headers['X-Odoo-Tags'] = ','.join(self.tag_ids.mapped('name'))
- res['headers'] = repr(headers)
- return res
+ return headers
- def _message_post_after_hook(self, message, *args, **kwargs):
+ def _message_post_after_hook(self, message, msg_vals):
if self.email_from and not self.partner_id:
# we consider that posting a message with a specified recipient (not a follower, a specific one)
# on a document without customer means that it was created through the chatter using
@@ -933,7 +927,7 @@ class Task(models.Model):
('partner_id', '=', False),
('email_from', '=', new_partner.email),
('stage_id.fold', '=', False)]).write({'partner_id': new_partner.id})
- return super(Task, self)._message_post_after_hook(message, *args, **kwargs)
+ return super(Task, self)._message_post_after_hook(message, msg_vals)
def action_assign_to_me(self):
self.write({'user_id': self.env.user.id})
diff --git a/addons/rating/models/rating_mixin.py b/addons/rating/models/rating_mixin.py
index 932772c4dd6..f7f35080a18 100644
--- a/addons/rating/models/rating_mixin.py
+++ b/addons/rating/models/rating_mixin.py
@@ -155,12 +155,12 @@ class RatingMixin(models.AbstractModel):
if subtype_id is False:
subtype_id = self.env['ir.model.data'].xmlid_to_res_id('mail.mt_note')
if force_send:
- self = self.with_context(mail_notify_force_send=True)
+ self = self.with_context(mail_notify_force_send=True) # default value is True, should be set to false if not?
for record in self:
record.message_post_with_template(
template.id,
composition_mode=composition_mode,
- notif_layout=notif_layout if notif_layout is not None else 'mail.mail_notification_light',
+ email_layout_xmlid=notif_layout if notif_layout is not None else 'mail.mail_notification_light',
subtype_id=subtype_id
)
diff --git a/addons/sale/models/payment.py b/addons/sale/models/payment.py
index ae73e9ba0e7..8580878a45d 100644
--- a/addons/sale/models/payment.py
+++ b/addons/sale/models/payment.py
@@ -106,7 +106,7 @@ class PaymentTransaction(models.Model):
for trans in self.filtered(lambda t: t.sale_order_ids):
trans = trans.with_context(ctx_company)
for invoice in trans.invoice_ids:
- invoice.message_post_with_template(int(default_template), notif_layout="mail.mail_notification_paynow")
+ invoice.message_post_with_template(int(default_template), email_layout_xmlid="mail.mail_notification_paynow")
return res
@api.multi
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index 952fbbdde05..63d219df0c8 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -667,7 +667,7 @@ class SaleOrder(models.Model):
template_id = self._find_mail_template(force_confirmation_template=True)
if template_id:
for order in self:
- order.with_context(force_send=True).message_post_with_template(template_id, composition_mode='comment', notif_layout="mail.mail_notification_paynow")
+ order.with_context(force_send=True).message_post_with_template(template_id, composition_mode='comment', email_layout_xmlid="mail.mail_notification_paynow")
@api.multi
def action_done(self):
@@ -782,18 +782,17 @@ class SaleOrder(models.Model):
return (self.state == 'sent' or (self.state == 'draft' and include_draft)) and not self.is_expired and self.require_payment and transaction.state != 'done' and self.amount_total
@api.multi
- def _notify_get_groups(self, message, groups):
+ def _notify_get_groups(self):
""" Give access button to users and portal customer as portal is integrated
in sale. Customer and portal group have probably no right to see
the document so they don't have the access button. """
- groups = super(SaleOrder, self)._notify_get_groups(message, groups)
+ groups = super(SaleOrder, self)._notify_get_groups()
self.ensure_one()
if self.state not in ('draft', 'cancel'):
for group_name, group_method, group_data in groups:
- if group_name in ('customer', 'portal'):
- continue
- group_data['has_button_access'] = True
+ if group_name not in ('customer', 'portal'):
+ group_data['has_button_access'] = True
return groups
diff --git a/addons/sale_coupon/models/sale_order.py b/addons/sale_coupon/models/sale_order.py
index f19668de7b5..3487317330e 100644
--- a/addons/sale_coupon/models/sale_order.py
+++ b/addons/sale_coupon/models/sale_order.py
@@ -246,7 +246,7 @@ class SaleOrder(models.Model):
self.message_post_with_template(
template.id, composition_mode='comment',
model='sale.coupon', res_id=coupon.id,
- notif_layout='mail.mail_notification_light',
+ email_layout_xmlid='mail.mail_notification_light',
)
def _get_applicable_programs(self):
diff --git a/addons/test_mail/tests/test_discuss.py b/addons/test_mail/tests/test_discuss.py
index 2606a6aef3e..3cb885b715c 100644
--- a/addons/test_mail/tests/test_discuss.py
+++ b/addons/test_mail/tests/test_discuss.py
@@ -17,24 +17,17 @@ class TestChatterTweaks(BaseFunctionalTest, TestRecipients):
def test_post_no_subscribe_recipients(self):
original = self.test_record.message_follower_ids
self.test_record.sudo(self.user_employee).with_context({'mail_create_nosubscribe': True}).message_post(
- body='Test Body', message_type='comment', subtype='mt_comment', partner_ids=[(4, self.partner_1.id), (4, self.partner_2.id)])
+ body='Test Body', message_type='comment', subtype='mt_comment', partner_ids=[self.partner_1.id, self.partner_2.id])
self.assertEqual(self.test_record.message_follower_ids.mapped('partner_id'), original.mapped('partner_id'))
self.assertEqual(self.test_record.message_follower_ids.mapped('channel_id'), original.mapped('channel_id'))
def test_post_subscribe_recipients(self):
original = self.test_record.message_follower_ids
self.test_record.sudo(self.user_employee).with_context({'mail_create_nosubscribe': True, 'mail_post_autofollow': True}).message_post(
- body='Test Body', message_type='comment', subtype='mt_comment', partner_ids=[(4, self.partner_1.id), (4, self.partner_2.id)])
+ body='Test Body', message_type='comment', subtype='mt_comment', partner_ids=[self.partner_1.id, self.partner_2.id])
self.assertEqual(self.test_record.message_follower_ids.mapped('partner_id'), original.mapped('partner_id') | self.partner_1 | self.partner_2)
self.assertEqual(self.test_record.message_follower_ids.mapped('channel_id'), original.mapped('channel_id'))
- def test_post_subscribe_recipients_partial(self):
- original = self.test_record.message_follower_ids
- self.test_record.sudo(self.user_employee).with_context({'mail_create_nosubscribe': True, 'mail_post_autofollow': True, 'mail_post_autofollow_partner_ids': [self.partner_2.id]}).message_post(
- body='Test Body', message_type='comment', subtype='mt_comment', partner_ids=[(4, self.partner_1.id), (4, self.partner_2.id)])
- self.assertEqual(self.test_record.message_follower_ids.mapped('partner_id'), original.mapped('partner_id') | self.partner_2)
- self.assertEqual(self.test_record.message_follower_ids.mapped('channel_id'), original.mapped('channel_id'))
-
def test_chatter_mail_create_nolog(self):
""" Test disable of automatic chatter message at create """
rec = self.env['mail.test.simple'].sudo(self.user_employee).with_context({'mail_create_nolog': True}).create({'name': 'Test'})
diff --git a/addons/test_mail/tests/test_mail_gateway.py b/addons/test_mail/tests/test_mail_gateway.py
index 03373e585ee..f0868225e63 100644
--- a/addons/test_mail/tests/test_mail_gateway.py
+++ b/addons/test_mail/tests/test_mail_gateway.py
@@ -595,45 +595,3 @@ class TestMailgateway(BaseFunctionalTest, MockEmails):
self.assertEqual(len(record), 1)
self.assertEqual(record.name, 'Spammy')
self.assertEqual(record._name, 'mail.test.gateway')
-
- @mute_logger('odoo.addons.mail.models.mail_thread', 'odoo.models', 'odoo.addons.mail.models.mail_mail')
- def test_private_discussion(self):
- """ Testing private discussion between partners. """
- self.partner_2 = self.env['res.partner'].with_context(BaseFunctionalTest._test_context).create({
- 'name': 'Admin',
- 'email': 'admin@agrolait.com',
- })
- msg1_pids = [self.partner_1.id, self.partner_2.id]
-
- # Do: Raoul writes to Bert and Administrator, with a model specific by parameter that should not be taken into account
- msg1 = self.env['mail.thread'].sudo(self.user_employee).message_post(partner_ids=msg1_pids, subtype='mail.mt_comment', model='mail.test')
-
- # Test: message recipients
- msg = self.env['mail.message'].browse(msg1.id)
- self.assertEqual(msg.partner_ids, self.partner_2 | self.partner_1,
- 'message_post: private discussion: incorrect recipients')
- self.assertEqual(msg.model, False,
- 'message_post: private discussion: parameter model not correctly ignored when having no res_id')
- # Test: message-id
- self.assertIn('openerp-private', msg.message_id.split('@')[0], 'message_post: private discussion: message-id should contain the private keyword')
-
- # Do: Bert replies through mailgateway (is a customer)
- self.format_and_process(MAIL_TEMPLATE, 'valid.lelitre@agrolait.com', 'not_important@mydomain.com', extra='In-Reply-To: %s' % msg.message_id)
-
- # Test: last mail_message created
- msg2 = self.env['mail.message'].search([], limit=1)
- # Test: message recipients
- self.assertEqual(msg2.author_id, self.partner_1,
- 'message_post: private discussion: wrong author through mailgateway based on email')
- self.assertEqual(msg2.partner_ids, self.user_employee.partner_id | self.partner_2,
- 'message_post: private discussion: incorrect recipients when replying')
-
- # Do: Bert replies through chatter (is a customer)
- msg3 = self.env['mail.thread'].message_post(author_id=self.partner_1.id, parent_id=msg1.id, subtype='mail.mt_comment')
-
- # Test: message recipients
- msg = self.env['mail.message'].browse(msg3.id)
- self.assertEqual(msg.partner_ids, self.user_employee.partner_id | self.partner_2,
- 'message_post: private discussion: incorrect recipients when replying')
- self.assertEqual(msg.needaction_partner_ids, self.user_employee.partner_id | self.partner_2,
- 'message_post: private discussion: incorrect notified recipients when replying')
diff --git a/addons/test_mail/tests/test_message_compose.py b/addons/test_mail/tests/test_message_compose.py
index 2397023db24..32a9a44e3ee 100644
--- a/addons/test_mail/tests/test_message_compose.py
+++ b/addons/test_mail/tests/test_message_compose.py
@@ -205,17 +205,20 @@ class TestMessagePost(BaseFunctionalTest, MockEmails, TestRecipients):
def test_post_notify(self):
self.user_employee.write({'notification_type': 'inbox'})
- new_notification = self.env['mail.thread'].message_notify(
+ new_notification = self.test_record.message_notify(
subject='This should be a subject',
body='You have received a notification
',
- partner_ids=[(4, self.partner_1.id), (4, self.user_employee.partner_id.id)],
+ partner_ids=[self.partner_1.id, self.user_employee.partner_id.id],
)
self.assertEqual(new_notification.subtype_id, self.env.ref('mail.mt_note'))
+ self.assertEqual(new_notification.message_type, 'user_notification')
self.assertEqual(new_notification.body, 'You have received a notification
')
self.assertEqual(new_notification.author_id, self.env.user.partner_id)
self.assertEqual(new_notification.email_from, formataddr((self.env.user.name, self.env.user.email)))
self.assertEqual(new_notification.needaction_partner_ids, self.partner_1 | self.user_employee.partner_id)
+ self.assertNotIn(new_notification, self.test_record.message_ids)
+ # todo xdo add test message_notify on thread with followers and stuff
class TestComposer(BaseFunctionalTest, MockEmails, TestRecipients):
diff --git a/addons/test_mail/tests/test_message_track.py b/addons/test_mail/tests/test_message_track.py
index 6de2b4373f0..271aaa785af 100644
--- a/addons/test_mail/tests/test_message_track.py
+++ b/addons/test_mail/tests/test_message_track.py
@@ -163,8 +163,8 @@ class TestTracking(common.BaseFunctionalTest, common.MockEmails):
self.record._fields['email_from'].groups = 'base.group_erp_manager' # patch the group attribute
self.record.sudo().write({'email_from': 'X'})
- msg_emp = self.partner_employee.sudo(self.user_employee)._notify_prepare_template_context(self.record.message_ids, self.record)
- msg_admin = self.partner_admin.sudo(self.user_admin)._notify_prepare_template_context(self.record.message_ids, self.record)
+ msg_emp = self.record.sudo(self.user_employee)._notify_prepare_template_context(self.record.message_ids, {})
+ msg_admin = self.record.sudo(self.user_admin)._notify_prepare_template_context(self.record.message_ids, {})
self.assertFalse(msg_emp.get('tracking_values'), "should not have protected tracking values")
self.assertTrue(msg_admin.get('tracking_values'), "should have protected tracking values")
diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py
index 08ded3c4769..cb2300a6df3 100644
--- a/addons/test_mail/tests/test_performance.py
+++ b/addons/test_mail/tests/test_performance.py
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
+import base64
from email.utils import formataddr
@@ -82,7 +83,7 @@ class TestMailPerformance(TransactionCase):
'partner_id': self.env.ref('base.res_partner_12').id,
})
- with self.assertQueryCount(__system__=5, demo=5): # test_mail only: 5 - 5
+ with self.assertQueryCount(__system__=4, demo=4): # test_mail only: 4 - 4
record.track = 'X'
@users('__system__', 'demo')
@@ -98,13 +99,13 @@ class TestMailPerformance(TransactionCase):
@warmup
def test_create_mail_with_tracking(self):
""" Create records inheriting from 'mail.thread' (with field tracking). """
- with self.assertQueryCount(__system__=10, demo=10): # test_mail only: 10 - 10
+ with self.assertQueryCount(__system__=9, demo=9): # test_mail only: 9 - 9
self.env['test_performance.mail'].create({'name': 'X'})
@users('__system__', 'emp')
@warmup
def test_create_mail_simple(self):
- with self.assertQueryCount(__system__=8, emp=8): # test_mail only: 8 - 8
+ with self.assertQueryCount(__system__=7, emp=7): # test_mail only: 7 - 7
self.env['mail.test.simple'].create({'name': 'Test'})
@users('__system__', 'emp')
@@ -160,7 +161,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_adv_activity(self):
model = self.env['mail.test.activity']
- with self.assertQueryCount(__system__=9, emp=8): # test_mail only: 9 - 8
+ with self.assertQueryCount(__system__=8, emp=7): # test_mail only: 8 - 7
model.create({'name': 'Test'})
@users('__system__', 'emp')
@@ -172,7 +173,7 @@ class TestAdvMailPerformance(TransactionCase):
'default_res_model': 'mail.test.activity',
})
- with self.assertQueryCount(__system__=10, emp=17): # com runbot: 10 - 16 // test_mail only: 10 - 15
+ with self.assertQueryCount(__system__=10, emp=13): # com runbot: 10 - 13 // test_mail only: 10 - 13
activity = MailActivity.create({
'summary': 'Test Activity',
'res_id': record.id,
@@ -182,7 +183,7 @@ class TestAdvMailPerformance(TransactionCase):
#voip module read activity_type during create leading to one less query in enterprise on action_feedback
category = activity.activity_type_id.category
- with self.assertQueryCount(__system__=24, emp=41): # com runbot: 24 - 41 // test_mail only: 24 - 39
+ with self.assertQueryCount(__system__=24, emp=31): # com runbot: 24 - 31 // test_mail only: 24 - 31
activity.action_feedback(feedback='Zizisse Done !')
@users('__system__', 'emp')
@@ -191,7 +192,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_adv_activity_mixin(self):
record = self.env['mail.test.activity'].create({'name': 'Test'})
- with self.assertQueryCount(__system__=10, emp=17): # com runbot: 10 - 16 // test_mail only: 10 - 15
+ with self.assertQueryCount(__system__=10, emp=14): # com runbot: 10 - 14 // test_mail only: 10 - 14
activity = record.action_start('Test Start')
#read activity_type to normalize cache between enterprise and community
#voip module read activity_type during create leading to one less query in enterprise on action_close
@@ -199,7 +200,7 @@ class TestAdvMailPerformance(TransactionCase):
record.write({'name': 'Dupe write'})
- with self.assertQueryCount(__system__=26, emp=42): # com runbot: 26 - 42 // test_mail only: 26 - 40
+ with self.assertQueryCount(__system__=26, emp=31): # com runbot: 26 - 31 // test_mail only: 26 - 31
record.action_close('Dupe feedback')
self.assertEqual(record.activity_ids, self.env['mail.activity'])
@@ -210,7 +211,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_message_assignation_email(self):
self.user_test.write({'notification_type': 'email'})
record = self.env['mail.test.track'].create({'name': 'Test'})
- with self.assertQueryCount(__system__=61, emp=76): # com runbot: 61 - 76 // test_mail only: 61 - 71
+ with self.assertQueryCount(__system__=56, emp=59): # com runbot: 56 - 59 // test_mail only: 56 - 59
record.write({
'user_id': self.user_test.id,
})
@@ -219,7 +220,7 @@ class TestAdvMailPerformance(TransactionCase):
@warmup
def test_message_assignation_inbox(self):
record = self.env['mail.test.track'].create({'name': 'Test'})
- with self.assertQueryCount(__system__=37, emp=44): # test_mail only: 37 - 44
+ with self.assertQueryCount(__system__=34, emp=40): # test_mail only: 34 - 40
record.write({
'user_id': self.user_test.id,
})
@@ -239,7 +240,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_message_log_with_post(self):
record = self.env['mail.test.simple'].create({'name': 'Test'})
- with self.assertQueryCount(__system__=7, emp=13): # test_mail only: 7 - 13
+ with self.assertQueryCount(__system__=6, emp=7): # test_mail only: 6 - 7
record.message_post(
body='Test message_post as log
',
subtype='mail.mt_note',
@@ -250,7 +251,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_message_post_no_notification(self):
record = self.env['mail.test.simple'].create({'name': 'Test'})
- with self.assertQueryCount(__system__=7, emp=13): # test_mail only: 7 - 13
+ with self.assertQueryCount(__system__=6, emp=7): # test_mail only: 6 - 7
record.message_post(
body='Test Post Performances basic
',
partner_ids=[],
@@ -263,7 +264,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_message_post_one_email_notification(self):
record = self.env['mail.test.simple'].create({'name': 'Test'})
- with self.assertQueryCount(__system__=52, emp=72): # com runbot: 49 - 69 // test_mail only: 52 - 69
+ with self.assertQueryCount(__system__=47, emp=51): # com runbot: 47 - 51 // test_mail only: 47 - 51
record.message_post(
body='Test Post Performances with an email ping
',
partner_ids=self.customer.ids,
@@ -275,7 +276,7 @@ class TestAdvMailPerformance(TransactionCase):
def test_message_post_one_inbox_notification(self):
record = self.env['mail.test.simple'].create({'name': 'Test'})
- with self.assertQueryCount(__system__=32, emp=44): # com runbot 31 - 43 // test_mail only: 32 - 44
+ with self.assertQueryCount(__system__=30, emp=36): # com runbot 30 - 36 // test_mail only: 30 - 36
record.message_post(
body='Test Post Performances with an inbox ping
',
partner_ids=self.user_test.partner_id.ids,
@@ -385,8 +386,7 @@ class TestHeavyMailPerformance(TransactionCase):
'recipient_ids': [(4, pid) for pid in self.partners.ids],
})
mail_ids = mail.ids
-
- with self.assertQueryCount(__system__=14, emp=21): # test_mail only: 14 - 21
+ with self.assertQueryCount(__system__=16, emp=22): # test_mail only: 16 - 22
self.env['mail.mail'].browse(mail_ids).send()
self.assertEqual(mail.body_html, 'Test
')
@@ -399,7 +399,7 @@ class TestHeavyMailPerformance(TransactionCase):
self.umbrella.message_subscribe(self.user_portal.partner_id.ids)
record = self.umbrella.sudo(self.env.user)
- with self.assertQueryCount(__system__=85, emp=108): # com runbot: 82 - 105 // test_mail only: 85 - 105
+ with self.assertQueryCount(__system__=78, emp=82): # com runbot: 78 - 82 // test_mail only: 78 - 82
record.message_post(
body='Test Post Performances
',
message_type='comment',
@@ -416,7 +416,7 @@ class TestHeavyMailPerformance(TransactionCase):
record = self.umbrella.sudo(self.env.user)
template_id = self.env.ref('test_mail.mail_test_tpl').id
- with self.assertQueryCount(__system__=102, emp=126): # com runbot: 99 - 123 // test_mail only: 102 - 123
+ with self.assertQueryCount(__system__=95, emp=101): # com runbot: 95 - 101 // test_mail only: 95 - 101
record.message_post_with_template(template_id, message_type='comment', composition_mode='comment')
self.assertEqual(record.message_ids[0].body, 'Adding stuff on %s
' % record.name)
@@ -485,7 +485,7 @@ class TestHeavyMailPerformance(TransactionCase):
'user_id': self.env.uid,
})
self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id)
- with self.assertQueryCount(__system__=60, emp=75): # com runbot: 60 - 75 // test_mail only: 60 - 72
+ with self.assertQueryCount(__system__=55, emp=58): # com runbot: 55 - 58 // test_mail only: 55 - 58
rec.write({'user_id': self.user_portal.id})
self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id)
# write tracking message
@@ -505,7 +505,7 @@ class TestHeavyMailPerformance(TransactionCase):
customer_id = self.customer.id
user_id = self.user_portal.id
- with self.assertQueryCount(__system__=155, emp=172): # com runbot: 155 - 172 // test_mail only: 154 - 168
+ with self.assertQueryCount(__system__=147, emp=155): # com runbot: 147 - 155 // test_mail only: 147 - 155
rec = self.env['mail.test.full'].create({
'name': 'Test',
'umbrella_id': umbrella_id,
@@ -532,7 +532,7 @@ class TestHeavyMailPerformance(TransactionCase):
})
self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id)
self.assertEqual(len(rec.message_ids), 1)
- with self.assertQueryCount(__system__=99, emp=122): # com runbot: 99 - 122 // test_mail only: 99 - 119
+ with self.assertQueryCount(__system__=96, emp=101): # com runbot: 96 - 101 // test_mail only: 96 - 101
rec.write({
'name': 'Test2',
'umbrella_id': self.umbrella.id,
@@ -568,7 +568,7 @@ class TestHeavyMailPerformance(TransactionCase):
})
self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id)
- with self.assertQueryCount(__system__=105, emp=127): # test_mail only: 104 - 123
+ with self.assertQueryCount(__system__=101, emp=106): # test_mail only: 101 - 106
rec.write({
'name': 'Test2',
'umbrella_id': umbrella_id,
@@ -600,7 +600,7 @@ class TestHeavyMailPerformance(TransactionCase):
})
self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id)
- with self.assertQueryCount(__system__=52, emp=66): # test_mail only: 51 - 66
+ with self.assertQueryCount(__system__=50, emp=62): # test_mail only: 50 - 62
rec.write({
'name': 'Test2',
'customer_id': customer_id,
@@ -617,3 +617,159 @@ class TestHeavyMailPerformance(TransactionCase):
self.assertEqual(rec.message_ids[2].subtype_id, self.env.ref('test_mail.st_mail_test_full_umbrella_upd'))
self.assertEqual(rec.message_ids[2].needaction_partner_ids, self.partners | self.user_portal.partner_id)
self.assertEqual(len(rec.message_ids), 3)
+
+
+@tagged('mail_performance')
+class TestMailPerformancePost(TransactionCase):
+
+ def setUp(self):
+ super(TestMailPerformancePost, self).setUp()
+
+ self._quick_create_ctx = {
+ 'no_reset_password': True,
+ 'mail_create_nolog': True,
+ 'mail_create_nosubscribe': True,
+ 'mail_notrack': True,
+ }
+ self.user_employee = self.env['res.users'].with_context(self._quick_create_ctx).create({
+ 'name': 'Ernest Employee',
+ 'login': 'emp',
+ 'email': 'e.e@example.com',
+ 'signature': '--\nErnest',
+ 'notification_type': 'inbox',
+ 'groups_id': [(6, 0, [self.env.ref('base.group_user').id])],
+ })
+ # record
+ self.customer = self.env['res.partner'].with_context(self._quick_create_ctx).create({
+ 'name': 'customer',
+ 'email': 'customer@example.com',
+ })
+ self.record = self.env['mail.test'].with_context(mail_create_nosubscribe=True).create({
+ 'name': 'Test record',
+ 'customer_id': self.customer.id,
+ 'alias_name': 'test-alias',
+ })
+ # followers
+ self.user_follower_email = self.env['res.users'].with_context(self._quick_create_ctx).create({
+ 'name': 'user_follower_email',
+ 'login': 'user_follower_email',
+ 'email': 'user_follower_email@example.com',
+ 'notification_type': 'email',
+ 'groups_id': [(6, 0, [self.env.ref('base.group_user').id])],
+ })
+ self.user_follower_inbox = self.env['res.users'].with_context(self._quick_create_ctx).create({
+ 'name': 'user_follower_inbox',
+ 'login': 'user_follower_inbox',
+ 'email': 'user_follower_inbox@example.com',
+ 'notification_type': 'inbox',
+ 'groups_id': [(6, 0, [self.env.ref('base.group_user').id])],
+ })
+ self.partner_follower = self.env['res.partner'].with_context(self._quick_create_ctx).create({
+ 'name': 'partner_follower',
+ 'email': 'partner_follower@example.com',
+ })
+ self.record.message_subscribe([
+ self.partner_follower.id,
+ self.user_follower_inbox.partner_id.id,
+ self.user_follower_email.partner_id.id
+ ])
+
+ # partner_ids
+ self.user_inbox = self.env['res.users'].with_context(self._quick_create_ctx).create({
+ 'name': 'user_inbox',
+ 'login': 'user_inbox',
+ 'email': 'user_inbox@example.com',
+ 'notification_type': 'inbox',
+ 'groups_id': [(6, 0, [self.env.ref('base.group_user').id])],
+ })
+ self.user_email = self.env['res.users'].with_context(self._quick_create_ctx).create({
+ 'name': 'user_email',
+ 'login': 'user_email',
+ 'email': 'user_email@example.com',
+ 'notification_type': 'email',
+ 'groups_id': [(6, 0, [self.env.ref('base.group_user').id])],
+ })
+ self.partner = self.env['res.partner'].with_context(self._quick_create_ctx).create({
+ 'name': 'partner',
+ 'email': 'partner@example.com',
+ })
+ # channels user/partner
+ self.partner_channel_inbox = self.env['res.partner'].with_context(self._quick_create_ctx).create({
+ 'name': 'partner_channel_inbox',
+ 'email': 'partner_channel_inbox@example.com',
+ })
+ self.partner_channel_email = self.env['res.partner'].with_context(self._quick_create_ctx).create({
+ 'name': 'partner_channel_email',
+ 'email': 'partner_channel_email@example.com',
+ })
+ self.user_channel_inbox = self.env['res.users'].with_context(self._quick_create_ctx).create({
+ 'name': 'user_channel_inbox',
+ 'login': 'user_channel_inbox',
+ 'email': 'user_channel_inbox@example.com',
+ 'notification_type': 'inbox',
+ 'groups_id': [(6, 0, [self.env.ref('base.group_user').id])],
+ })
+ self.user_channel_email = self.env['res.users'].with_context(self._quick_create_ctx).create({
+ 'name': 'user_channel_email',
+ 'login': 'user_channel_email',
+ 'email': 'user_channel_email@example.com',
+ 'notification_type': 'inbox',
+ 'groups_id': [(6, 0, [self.env.ref('base.group_user').id])],
+ })
+ # channels
+ self.channel_inbox = self.env['mail.channel'].with_context(self._quick_create_ctx).create({
+ 'name': 'channel_inbox',
+ 'channel_partner_ids': [(4, self.partner_channel_inbox.id), (4, self.user_channel_inbox.partner_id.id)]
+ })
+ self.channel_email = self.env['mail.channel'].with_context(self._quick_create_ctx).create({
+ 'name': 'channel_email',
+ 'email_send': True,
+ 'channel_partner_ids': [(4, self.partner_channel_email.id), (4, self.user_channel_email.partner_id.id)]
+ })
+ self.vals = [{
+ 'datas': base64.b64encode(bytes("attachement content %s" % i, 'utf-8')),
+ 'name': 'attach %s' % i,
+ 'datas_fname': 'fileText_test%s.txt' % i,
+ 'mimetype': 'text/plain',
+ 'res_model': 'mail.compose.message',
+ 'res_id': 0,
+ } for i in range(3)]
+
+ self.patch(self.env.registry, 'ready', True)
+
+ @mute_logger('odoo.tests', 'odoo.addons.mail.models.mail_mail', 'odoo.models.unlink')
+ @users('emp')
+ @warmup
+ def test_complete_message_post(self):
+ # aims to cover as much features of message_post as possible
+ partner_ids = [self.user_inbox.partner_id.id, self.user_email.partner_id.id, self.partner.id]
+ channel_ids = [self.channel_inbox.id, self.channel_email.id]
+ record = self.record.sudo(self.env.user)
+ attachements = [ # not linear on number of attachements
+ ('attach tuple 1', "attachement tupple content 1"),
+ ('attach tuple 2', "attachement tupple content 2", {'cid': 'cid1'}),
+ ('attach tuple 3', "attachement tupple content 3", {'cid': 'cid2'}),
+ ]
+ self.attachements = self.env['ir.attachment'].sudo(self.env.user).create(self.vals) #-> 163-> 165 query
+ attachement_ids = self.attachements.ids
+ with self.assertQueryCount(emp=163): # com runbot 156 // test_mail only: 133
+ self.cr.sql_log = self.warm and self.cr.sql_log_count
+ record.with_context({}).message_post(
+ body='Test body 
',
+ subject='Test Subject',
+ message_type='notification',
+ subtype=None,
+ partner_ids=partner_ids,
+ channel_ids=channel_ids,
+ parent_id=False,
+ attachments=attachements,
+ attachment_ids=attachement_ids,
+ add_sign=True,
+ model_description=False,
+ mail_auto_delete=True
+ )
+ self.cr.sql_log = False
+ self.assertTrue(record.message_ids[0].body.startswith('Test body