diff options
| author | Yannick Tivisse <yti@odoo.com> | 2017-10-17 10:23:57 +0200 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2017-10-17 11:58:51 +0200 |
| commit | 55af66dcda83641c9de84db7befecbadb71c2eee (patch) | |
| tree | f8f712003aae2a6fa93c8f7dd8a5cd429ee274d7 /addons | |
| parent | c2f59f08c70deaa4fcca605afa0062b68d1dbfdb (diff) | |
[FIX] mass_mailing: redefine the usable models in mass mailing
Displaying all the model is not readable for a common user. We should only display models that are fit to be used in a mass mailing campaign.
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/mass_mailing/models/mass_mailing.py | 12 | ||||
| -rw-r--r-- | addons/mass_mailing/views/mass_mailing_views.xml | 2 |
2 files changed, 12 insertions, 2 deletions
diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py index ca2e739c35c..2f3666efc77 100644 --- a/addons/mass_mailing/models/mass_mailing.py +++ b/addons/mass_mailing/models/mass_mailing.py @@ -15,6 +15,16 @@ from odoo.tools.translate import html_translate _logger = logging.getLogger(__name__) +MASS_MAILING_BUSINESS_MODELS = [ + 'crm.lead', + 'event.registration', + 'hr.applicant', + 'res.partner', + 'event.track', + 'sale.order', + 'mail.mass_mailing.list', +] + class MassMailingTag(models.Model): """Model of categories of mass mailing, i.e. marketing, newsletter, ... """ _name = 'mail.mass_mailing.tag' @@ -320,7 +330,7 @@ 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_id = fields.Many2one('ir.model', string='Recipients Model', domain="[('is_mail_thread', '=', True)]", + mailing_model_id = fields.Many2one('ir.model', string='Recipients Model', domain=[('model', 'in', MASS_MAILING_BUSINESS_MODELS)], 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=[]) diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml index 076a6da0921..9cc4b63c97a 100644 --- a/addons/mass_mailing/views/mass_mailing_views.xml +++ b/addons/mass_mailing/views/mass_mailing_views.xml @@ -415,7 +415,7 @@ </div> <label for="mailing_model_id" string="Recipients"/> <div> - <field name="mailing_model_id"/> + <field name="mailing_model_id" widget="selection"/> <field name="mailing_model_name" invisible="1"/> <field name="mailing_model_real" invisible="1"/> <field name="mailing_domain" widget="domain" |