diff options
| author | Thibault Delavallée <tde@odoo.com> | 2019-07-17 13:18:38 +0000 |
|---|---|---|
| committer | Thibault Delavallée <tde@odoo.com> | 2019-07-17 15:50:33 +0000 |
| commit | 49d2899fbd3e9b1c3b689fd5bdeb7f4fa0f6bfd1 (patch) | |
| tree | 209ed37e6ea42a8c116109d0e48ad1a07ce4d69c /addons/mass_mailing/wizard | |
| parent | 2011c24dd7530c56ba883ca2a468997c961a53fb (diff) | |
[REF] mass_mailing: rename mail.mass_mailing model
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 model to mailing.mailing. Rationale :
* mailing is now a prefix for mass mailing models;
* mailing.mailing is easier to read / find / understand;
Note that mail.mass_mailing.campaign is not updated as it is likely to be
removed soon and replaced by simple utm.campaign model.
MIGRATION
mail.mass_mailing model -> mailing.mailing
mail_mass_mailing table -> mailing_mailing
LINKS
Task ID 2037906
Preparing task ID 1997464 (SMS addition in mass mailing)
PR #34938
Diffstat (limited to 'addons/mass_mailing/wizard')
| -rw-r--r-- | addons/mass_mailing/wizard/__init__.py | 4 | ||||
| -rw-r--r-- | addons/mass_mailing/wizard/mail_compose_message.py | 4 | ||||
| -rw-r--r-- | addons/mass_mailing/wizard/mailing_mailing_schedule_date.py (renamed from addons/mass_mailing/wizard/mass_mailing_schedule_date.py) | 6 | ||||
| -rw-r--r-- | addons/mass_mailing/wizard/mailing_mailing_schedule_date_views.xml (renamed from addons/mass_mailing/wizard/mass_mailing_schedule_date_views.xml) | 10 | ||||
| -rw-r--r-- | addons/mass_mailing/wizard/mailing_mailing_test.py (renamed from addons/mass_mailing/wizard/test_mailing.py) | 4 | ||||
| -rw-r--r-- | addons/mass_mailing/wizard/mailing_mailing_test_views.xml (renamed from addons/mass_mailing/wizard/test_mailing_views.xml) | 6 |
6 files changed, 17 insertions, 17 deletions
diff --git a/addons/mass_mailing/wizard/__init__.py b/addons/mass_mailing/wizard/__init__.py index e20c1b37026..d4f1e912d5e 100644 --- a/addons/mass_mailing/wizard/__init__.py +++ b/addons/mass_mailing/wizard/__init__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from . import test_mailing from . import mail_compose_message from . import mailing_list_merge -from . import mass_mailing_schedule_date +from . import mailing_mailing_schedule_date +from . import mailing_mailing_test diff --git a/addons/mass_mailing/wizard/mail_compose_message.py b/addons/mass_mailing/wizard/mail_compose_message.py index 00cdfff0864..d8be92aafc4 100644 --- a/addons/mass_mailing/wizard/mail_compose_message.py +++ b/addons/mass_mailing/wizard/mail_compose_message.py @@ -9,7 +9,7 @@ class MailComposeMessage(models.TransientModel): _inherit = 'mail.compose.message' mass_mailing_campaign_id = fields.Many2one('mail.mass_mailing.campaign', string='Mass Mailing Campaign') - mass_mailing_id = fields.Many2one('mail.mass_mailing', string='Mass Mailing', ondelete='cascade') + mass_mailing_id = fields.Many2one('mailing.mailing', string='Mass Mailing', ondelete='cascade') mass_mailing_name = fields.Char(string='Mass Mailing Name') mailing_list_ids = fields.Many2many('mailing.list', string='Mailing List') @@ -27,7 +27,7 @@ class MailComposeMessage(models.TransientModel): if not mass_mailing: reply_to_mode = 'email' if self.no_auto_thread else 'thread' reply_to = self.reply_to if self.no_auto_thread else False - mass_mailing = self.env['mail.mass_mailing'].create({ + mass_mailing = self.env['mailing.mailing'].create({ 'mass_mailing_campaign_id': self.mass_mailing_campaign_id.id, 'name': self.mass_mailing_name, 'template_id': self.template_id.id, diff --git a/addons/mass_mailing/wizard/mass_mailing_schedule_date.py b/addons/mass_mailing/wizard/mailing_mailing_schedule_date.py index c9a864ac6ca..1d239c51022 100644 --- a/addons/mass_mailing/wizard/mass_mailing_schedule_date.py +++ b/addons/mass_mailing/wizard/mailing_mailing_schedule_date.py @@ -5,12 +5,12 @@ from odoo import api, fields, models, _ from odoo.exceptions import ValidationError -class MassMailingScheduleDate(models.TransientModel): - _name = 'mass.mailing.schedule.date' +class MailingMailingScheduleDate(models.TransientModel): + _name = 'mailing.mailing.schedule.date' _description = 'Mass Mailing Scheduling' schedule_date = fields.Datetime(string='Schedule in the Future') - mass_mailing_id = fields.Many2one('mail.mass_mailing', required=True) + mass_mailing_id = fields.Many2one('mailing.mailing', required=True) @api.constrains('schedule_date') def _check_schedule_date(self): diff --git a/addons/mass_mailing/wizard/mass_mailing_schedule_date_views.xml b/addons/mass_mailing/wizard/mailing_mailing_schedule_date_views.xml index 46b3244dbb4..4840b16039d 100644 --- a/addons/mass_mailing/wizard/mass_mailing_schedule_date_views.xml +++ b/addons/mass_mailing/wizard/mailing_mailing_schedule_date_views.xml @@ -1,8 +1,8 @@ <?xml version="1.0"?> <odoo> - <record id="mass_mailing_schedule_date_view_form" model="ir.ui.view"> - <field name="name">mass.mailing.schedule.date.view.form</field> - <field name="model">mass.mailing.schedule.date</field> + <record id="mailing_mailing_schedule_date_view_form" model="ir.ui.view"> + <field name="name">mailing.mailing.schedule.date.view.form</field> + <field name="model">mailing.mailing.schedule.date</field> <field name="arch" type="xml"> <form string="Take Future Schedule Date"> <group> @@ -18,9 +18,9 @@ </field> </record> - <record id="mass_mailing_schedule_date_action" model="ir.actions.act_window"> + <record id="mailing_mailing_schedule_date_action" model="ir.actions.act_window"> <field name="name">When do you want to send your mailing?</field> - <field name="res_model">mass.mailing.schedule.date</field> + <field name="res_model">mailing.mailing.schedule.date</field> <field name="type">ir.actions.act_window</field> <field name="view_mode">form</field> <field name="target">new</field> diff --git a/addons/mass_mailing/wizard/test_mailing.py b/addons/mass_mailing/wizard/mailing_mailing_test.py index ba66510ca68..54424262563 100644 --- a/addons/mass_mailing/wizard/test_mailing.py +++ b/addons/mass_mailing/wizard/mailing_mailing_test.py @@ -5,12 +5,12 @@ from odoo import api, fields, models, tools class TestMassMailing(models.TransientModel): - _name = 'mail.mass_mailing.test' + _name = 'mailing.mailing.test' _description = 'Sample Mail Wizard' email_to = fields.Char(string='Recipients', required=True, help='Comma-separated list of email addresses.', default=lambda self: self.env['mail.message']._get_default_from()) - mass_mailing_id = fields.Many2one('mail.mass_mailing', string='Mailing', required=True, ondelete='cascade') + mass_mailing_id = fields.Many2one('mailing.mailing', string='Mailing', required=True, ondelete='cascade') def send_mail_test(self): self.ensure_one() diff --git a/addons/mass_mailing/wizard/test_mailing_views.xml b/addons/mass_mailing/wizard/mailing_mailing_test_views.xml index bc369863604..901f5c9105d 100644 --- a/addons/mass_mailing/wizard/test_mailing_views.xml +++ b/addons/mass_mailing/wizard/mailing_mailing_test_views.xml @@ -2,8 +2,8 @@ <odoo> <record model="ir.ui.view" id="view_mail_mass_mailing_test_form"> - <field name="name">mail.mass_mailing.test.form</field> - <field name="model">mail.mass_mailing.test</field> + <field name="name">mailing.mailing.test.form</field> + <field name="model">mailing.mailing.test</field> <field name="arch" type="xml"> <form string="Send a Sample Mail"> <p class="text-muted"> @@ -22,7 +22,7 @@ <record id="action_mail_mass_mailing_test" model="ir.actions.act_window"> <field name="name">Mailing Test</field> - <field name="res_model">mail.mass_mailing.test</field> + <field name="res_model">mailing.mailing.test</field> <field name="view_mode">form</field> <field name="target">new</field> </record> |
