From 51b5ee7c3c1bbc08c5aa284300fd95f63cbf7ad1 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Wed, 13 Sep 2017 15:18:12 +0200 Subject: [PATCH] [IMP] mass_mailing: choose model among all chatter models This commit removes the strange selection box based on a magic flag and some strange methods returning a string. Instead just allow to send mass mailing on all models inheriting from mail.thread using the is mail thread flag. Various addons are updated to remove the _mail_mass_mailing class attribute used to determine mass mailing capability. We consider people could send a mass mailing on every model inheriting from mail.thread. It makes no sense to limit it to a given set of addons. --- addons/crm/models/crm_lead.py | 1 - addons/event/models/event.py | 2 +- .../hr_recruitment/models/hr_recruitment.py | 1 - addons/mail/models/mail_thread.py | 11 ------- addons/mail/models/res_partner.py | 1 - addons/mass_mailing/controllers/main.py | 2 +- .../mass_mailing/data/mass_mailing_demo.xml | 4 +-- addons/mass_mailing/models/mass_mailing.py | 30 +++++-------------- .../mass_mailing/views/mass_mailing_views.xml | 11 +++---- .../wizard/mail_compose_message.py | 4 +-- addons/mass_mailing_event/models/event.py | 2 +- .../mass_mailing_event_track/models/event.py | 2 +- .../website_event_track/models/event_track.py | 1 - .../website_mass_mailing/controllers/main.py | 2 +- odoo/addons/base/security/base_security.xml | 2 +- 15 files changed, 24 insertions(+), 52 deletions(-) diff --git a/addons/crm/models/crm_lead.py b/addons/crm/models/crm_lead.py index 90d24275051..3f1b79cff76 100644 --- a/addons/crm/models/crm_lead.py +++ b/addons/crm/models/crm_lead.py @@ -51,7 +51,6 @@ class Lead(models.Model): _description = "Lead/Opportunity" _order = "priority desc,activity_date_deadline,id desc" _inherit = ['mail.thread', 'mail.activity.mixin', 'utm.mixin', 'format.address.mixin'] - _mail_mass_mailing = _('Leads / Opportunities') def _default_probability(self): stage_id = self._default_stage_id() diff --git a/addons/event/models/event.py b/addons/event/models/event.py index c5f7f43915a..85406ba3ba9 100644 --- a/addons/event/models/event.py +++ b/addons/event/models/event.py @@ -319,12 +319,12 @@ class EventEvent(models.Model): def _is_event_registrable(self): return True + class EventRegistration(models.Model): _name = 'event.registration' _description = 'Attendee' _inherit = ['mail.thread'] _order = 'name, create_date desc' - _mail_mass_mailing = _('Event Attendees') origin = fields.Char( string='Source Document', readonly=True, diff --git a/addons/hr_recruitment/models/hr_recruitment.py b/addons/hr_recruitment/models/hr_recruitment.py index 3a237e9f283..5f432488587 100644 --- a/addons/hr_recruitment/models/hr_recruitment.py +++ b/addons/hr_recruitment/models/hr_recruitment.py @@ -89,7 +89,6 @@ class Applicant(models.Model): _description = "Applicant" _order = "priority desc, id desc" _inherit = ['mail.thread', 'mail.activity.mixin', 'utm.mixin'] - _mail_mass_mailing = _('Applicants') def _default_stage_id(self): if self._context.get('default_job_id'): diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index 6e097196a1b..2587601e2b1 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -79,7 +79,6 @@ class MailThread(models.AbstractModel): _description = 'Email Thread' _mail_flat_thread = True # flatten the discussino history _mail_post_access = 'write' # access required on the document to post on it - _mail_mass_mailing = False # enable mass mailing on this model _Attachment = namedtuple('Attachment', ('fname', 'content', 'info')) message_is_follower = fields.Boolean( @@ -2201,13 +2200,3 @@ class MailThread(models.AbstractModel): msg_comment.write({"res_id": new_thread.id, "model": new_thread._name}) msg_not_comment.write({"res_id": new_thread.id, "model": new_thread._name, "subtype_id": None}) return True - - # ------------------------------------------------------ - # Mass mailing - # ------------------------------------------------------ - - def message_mass_mailing_enabled(self): - if self._mail_mass_mailing: - # TODO master properly translate - # the _mail_mass_mailing is evaluted at code start so not translated - return _(self._mail_mass_mailing) diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py index 9140959f89e..0b7533c853d 100644 --- a/addons/mail/models/res_partner.py +++ b/addons/mail/models/res_partner.py @@ -18,7 +18,6 @@ class Partner(models.Model): _name = "res.partner" _inherit = ['res.partner', 'mail.thread', 'mail.activity.mixin'] _mail_flat_thread = False - _mail_mass_mailing = _('Customers') message_bounce = fields.Integer('Bounce', help="Counter of the number of bounced emails for this contact", default=0) opt_out = fields.Boolean( diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py index b2e77c2875e..bcee631aad6 100644 --- a/addons/mass_mailing/controllers/main.py +++ b/addons/mass_mailing/controllers/main.py @@ -17,7 +17,7 @@ class MassMailController(http.Controller): if mailing.exists(): res_id = res_id and int(res_id) res_ids = [] - if mailing.mailing_model == 'mail.mass_mailing.contact': + if mailing.mailing_model_name == 'mail.mass_mailing.contact': contacts = request.env['mail.mass_mailing.contact'].sudo().search([ ('email', '=', email), ('list_id', 'in', [mailing_list.id for mailing_list in mailing.contact_list_ids]) diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index 0afa9973dd0..347a04deaf1 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -64,7 +64,7 @@ done - res.partner + [('customer', '=', True)] email ]]> @@ -77,7 +77,7 @@ Second Newsletter draft - res.partner + [('customer', '=', True)] email ]]> diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py index 147f5447545..7050926c56a 100644 --- a/addons/mass_mailing/models/mass_mailing.py +++ b/addons/mass_mailing/models/mass_mailing.py @@ -290,22 +290,6 @@ class MassMailing(models.Model): res['reply_to_mode'] = 'thread' return res - def _get_mailing_model(self): - res = [] - for model_name in self.env: - model = self.env[model_name] - if hasattr(model, '_mail_mass_mailing') and getattr(model, '_mail_mass_mailing'): - if hasattr(model, 'message_mass_mailing_enabled'): - res.append((model._name, model.message_mass_mailing_enabled())) - else: - res.append((model._name, model._mail_mass_mailing)) - res.append(('mail.mass_mailing.contact', _('Mail Contacts'))) - res.append(('mail.mass_mailing.list', _('Mailing List'))) - return res - - # indirections for inheritance - _mailing_model = lambda self: self._get_mailing_model() - active = fields.Boolean(default=True) email_from = fields.Char(string='From', required=True, default=lambda self: self.env['mail.message']._get_default_from()) @@ -335,7 +319,9 @@ class MassMailing(models.Model): default=lambda self: self.env['mail.message']._get_default_from()) # recipients mailing_model_real = fields.Char(compute='_compute_model', string='Recipients Real Model', default='mail.mass_mailing.contact', required=True) - mailing_model = fields.Selection(selection=_mailing_model, string='Recipients Model', default='mail.mass_mailing.list') + mailing_model_id = fields.Many2one('ir.model', string='Recipients Model', domain="[('is_mail_thread', '=', True)]", + default=lambda self: self.env.ref('mass_mailing.model_mail_mass_mailing_list').id) + mailing_model_name = fields.Char(related='mailing_model_id.model', string='Recipients Model Name') mailing_domain = fields.Char(string='Domain', oldname='domain', default=[]) contact_list_ids = fields.Many2many('mail.mass_mailing.list', 'mail_mass_mailing_list_rel', string='Mailing Lists') @@ -376,10 +362,10 @@ class MassMailing(models.Model): for mass_mailing in self: mass_mailing.clicks_ratio = mapped_data.get(mass_mailing.id, 0) - @api.depends('mailing_model') + @api.depends('mailing_model_id') def _compute_model(self): for record in self: - record.mailing_model_real = (record.mailing_model != 'mail.mass_mailing.list') and record.mailing_model or 'mail.mass_mailing.contact' + record.mailing_model_real = (record.mailing_model_name != 'mail.mass_mailing.list') and record.mailing_model_name or 'mail.mass_mailing.contact' def _compute_statistics(self): """ Compute statistics of the mass mailing """ @@ -451,14 +437,14 @@ class MassMailing(models.Model): 'medium_id': self.mass_mailing_campaign_id.medium_id} self.update(dic) - @api.onchange('mailing_model', 'contact_list_ids') + @api.onchange('mailing_model_id', 'contact_list_ids') def _onchange_model_and_list(self): - if self.mailing_model == 'mail.mass_mailing.list': + if self.mailing_model_name == 'mail.mass_mailing.list': if self.contact_list_ids: self.mailing_domain = "[('list_ids', 'in', [%s]), ('opt_out', '=', False)]" % (','.join(str(id) for id in self.contact_list_ids.ids),) else: self.mailing_domain = "[(0, '=', 1)]" - elif 'opt_out' in self.env[self.mailing_model]._fields and not self.mailing_domain: + elif 'opt_out' in self.env[self.mailing_model_name]._fields and not self.mailing_domain: self.mailing_domain = "[('opt_out', '=', False)]" self.body_html = "on_change_model_and_list" diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml index 6eba6d8573b..7708a620335 100644 --- a/addons/mass_mailing/views/mass_mailing_views.xml +++ b/addons/mass_mailing/views/mass_mailing_views.xml @@ -413,15 +413,16 @@
-