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/static | |
| 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/static')
| -rw-r--r-- | addons/mass_mailing/static/src/js/mass_mailing.js | 2 | ||||
| -rw-r--r-- | addons/mass_mailing/static/tests/mass_mailing_html_tests.js | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/mass_mailing/static/src/js/mass_mailing.js b/addons/mass_mailing/static/src/js/mass_mailing.js index b516af7a47a..5d156c3cd65 100644 --- a/addons/mass_mailing/static/src/js/mass_mailing.js +++ b/addons/mass_mailing/static/src/js/mass_mailing.js @@ -28,7 +28,7 @@ KanbanRecord.include({ KanbanColumn.include({ init: function () { this._super.apply(this, arguments); - if (this.modelName === 'mail.mass_mailing') { + if (this.modelName === 'mailing.mailing') { this.draggable = false; } }, diff --git a/addons/mass_mailing/static/tests/mass_mailing_html_tests.js b/addons/mass_mailing/static/tests/mass_mailing_html_tests.js index 9a5f9ce259c..bf1d725dd90 100644 --- a/addons/mass_mailing/static/tests/mass_mailing_html_tests.js +++ b/addons/mass_mailing/static/tests/mass_mailing_html_tests.js @@ -14,7 +14,7 @@ QUnit.module('mass_mailing', {}, function () { QUnit.module('field html', { beforeEach: function () { this.data = weTestUtils.wysiwygData({ - 'mail.mass_mailing': { + 'mailing.mailing': { fields: { display_name: { string: "Displayed name", @@ -68,7 +68,7 @@ QUnit.test('save arch and html', async function (assert) { var form = await testUtils.createView({ View: FormView, - model: 'mail.mass_mailing', + model: 'mailing.mailing', data: this.data, arch: '<form>' + ' <field name="body_html" class="oe_read_only" widget="html"'+ @@ -152,7 +152,7 @@ QUnit.test('save and edit arch wysiwyg', async function (assert) { var form = await testUtils.createView({ View: FormView, - model: 'mail.mass_mailing', + model: 'mailing.mailing', data: this.data, arch: '<form>' + ' <header style="min-height:31px;">' + |
