From 2011c24dd7530c56ba883ca2a468997c961a53fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 17 Jul 2019 12:47:46 +0000 Subject: [PATCH] [REF] mass_mailing: rename mail.mass_mailing.{stage, tag} models PURPOSE Mass mailing is currently a bit messy. As SMS will be added as a way to notify people in mass through SMS let us take this opportunity to somehow clean this application: organization, light code cleaning, model renaming. SPECIFICATIONS Rename mail.mass_mailing.stage and mail.mass_mailing.tag models to mailing. stage and mailing.tag. Rationale : * mailing is now a prefix for models in mass mailing; * mailing.stage and mailing.tag are easier to read / find / understand; MIGRATION mail.mass_mailing.stage model -> mailing.stage mail_mass_mailing_stage table -> mailing_stage mail.mass_mailing.tag model -> mailing.tag mail_mass_mailing_tag table -> tag LINKS Task ID 2037906 Preparing task ID 1997464 (SMS addition in mass mailing) PR #34938 --- addons/mass_mailing/data/mass_mailing_data.xml | 6 +++--- addons/mass_mailing/data/mass_mailing_demo.xml | 2 +- addons/mass_mailing/models/mass_mailing.py | 14 +++++++------- addons/mass_mailing/security/ir.model.access.csv | 4 ++-- addons/mass_mailing/views/mass_mailing_views.xml | 16 ++++++++-------- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/addons/mass_mailing/data/mass_mailing_data.xml b/addons/mass_mailing/data/mass_mailing_data.xml index 5cf24ae5d9d..757e98eebb5 100644 --- a/addons/mass_mailing/data/mass_mailing_data.xml +++ b/addons/mass_mailing/data/mass_mailing_data.xml @@ -3,15 +3,15 @@ - + Schedule 10 - + Design 20 - + Sent 30 diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml index 825340f1618..6aebf35a814 100644 --- a/addons/mass_mailing/data/mass_mailing_demo.xml +++ b/addons/mass_mailing/data/mass_mailing_demo.xml @@ -51,7 +51,7 @@ - + Marketing diff --git a/addons/mass_mailing/models/mass_mailing.py b/addons/mass_mailing/models/mass_mailing.py index 29493baa4e8..ed09533b69d 100644 --- a/addons/mass_mailing/models/mass_mailing.py +++ b/addons/mass_mailing/models/mass_mailing.py @@ -33,9 +33,9 @@ MASS_MAILING_BUSINESS_MODELS = [ image_re = re.compile(r"data:(image/[A-Za-z]+);base64,(.*)") -class MassMailingTag(models.Model): +class MailingTag(models.Model): """Model of categories of mass mailing, i.e. marketing, newsletter, ... """ - _name = 'mail.mass_mailing.tag' + _name = 'mailing.tag' _description = 'Mass Mailing Tag' _order = 'name' @@ -47,10 +47,10 @@ class MassMailingTag(models.Model): ] -class MassMailingStage(models.Model): +class MailingStage(models.Model): """Stage for mass mailing campaigns. """ - _name = 'mail.mass_mailing.stage' + _name = 'mailing.stage' _description = 'Mass Mailing Campaign Stage' _order = 'sequence' @@ -65,8 +65,8 @@ class MassMailingCampaign(models.Model): _rec_name = "campaign_id" _inherits = {'utm.campaign': 'campaign_id'} - stage_id = fields.Many2one('mail.mass_mailing.stage', string='Stage', ondelete='restrict', required=True, - default=lambda self: self.env['mail.mass_mailing.stage'].search([], limit=1), + stage_id = fields.Many2one('mailing.stage', string='Stage', ondelete='restrict', required=True, + default=lambda self: self.env['mailing.stage'].search([], limit=1), group_expand='_group_expand_stage_ids') user_id = fields.Many2one( 'res.users', string='Responsible', @@ -78,7 +78,7 @@ class MassMailingCampaign(models.Model): medium_id = fields.Many2one('utm.medium', string='Medium', help="This is the delivery method, e.g. Postcard, Email, or Banner Ad", default=lambda self: self.env.ref('utm.utm_medium_email', False)) tag_ids = fields.Many2many( - 'mail.mass_mailing.tag', 'mail_mass_mailing_tag_rel', + 'mailing.tag', 'mail_mass_mailing_tag_rel', 'tag_id', 'campaign_id', string='Tags') mass_mailing_ids = fields.One2many( 'mail.mass_mailing', 'mass_mailing_campaign_id', diff --git a/addons/mass_mailing/security/ir.model.access.csv b/addons/mass_mailing/security/ir.model.access.csv index 1bf09f0486a..835060615c5 100644 --- a/addons/mass_mailing/security/ir.model.access.csv +++ b/addons/mass_mailing/security/ir.model.access.csv @@ -1,9 +1,9 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_mass_mailing_tag,mail.mass_mailing.tag,model_mail_mass_mailing_tag,mass_mailing.group_mass_mailing_campaign,1,1,1,1 +access_mailing_tag,access.mailing.tag,model_mailing_tag,mass_mailing.group_mass_mailing_campaign,1,1,1,1 access_mailing_contact_mm_user,access.mailing.contact.mm.user,model_mailing_contact,mass_mailing.group_mass_mailing_user,1,1,1,1 access_mailing_contact_subscription_mm_user,access.mailing.contact.subscription.mm.user,model_mailing_contact_subscription,mass_mailing.group_mass_mailing_user,1,1,1,1 access_mailing_list_mm_user,access.mailing.list.mm.user,model_mailing_list,mass_mailing.group_mass_mailing_user,1,1,1,1 -access_mass_mailing_stage,mail.mass_mailing.stage,model_mail_mass_mailing_stage,mass_mailing.group_mass_mailing_user,1,1,1,1 +access_mailing_stage,access.mailing.stage.mm.user,model_mailing_stage,mass_mailing.group_mass_mailing_user,1,1,1,1 access_mass_mailing_campaign,mail.mass_mailing.campaign,model_mail_mass_mailing_campaign,mass_mailing.group_mass_mailing_user,1,1,1,1 access_mass_mailing_campaign_system,mail.mass_mailing.campaign.system,model_mail_mass_mailing_campaign,base.group_system,1,1,1,1 access_mass_mailing,mail.mass_mailing,model_mail_mass_mailing,mass_mailing.group_mass_mailing_user,1,1,1,1 diff --git a/addons/mass_mailing/views/mass_mailing_views.xml b/addons/mass_mailing/views/mass_mailing_views.xml index 7643974d42b..6eebdad73b9 100644 --- a/addons/mass_mailing/views/mass_mailing_views.xml +++ b/addons/mass_mailing/views/mass_mailing_views.xml @@ -411,8 +411,8 @@ - mail.mass_mailing.stage.search - mail.mass_mailing.stage + mailing.stage.search + mailing.stage @@ -421,8 +421,8 @@ - mail.mass_mailing.stage.tree - mail.mass_mailing.stage + mailing.stage.tree + mailing.stage 10 @@ -433,7 +433,7 @@ Mailing Stages - mail.mass_mailing.stage + mailing.stage tree,form

@@ -449,8 +449,8 @@ - mail.mass_mailing.tag.form - mail.mass_mailing.tag + mailing.tag.form + mailing.tag

@@ -463,7 +463,7 @@ Campaign Tags - mail.mass_mailing.tag + mailing.tag

Add a new tag