diff options
| author | Achraf (abz) <abz@odoo.com> | 2021-04-16 10:00:30 +0000 |
|---|---|---|
| committer | Achraf (abz) <abz@odoo.com> | 2021-04-20 14:36:39 +0000 |
| commit | fc1005aa1e0e348495bf2ceb00081b5d8d7c5550 (patch) | |
| tree | 699a273e3647f2bf66079855343add3769f3bcf1 /addons/mass_mailing | |
| parent | 804934cec9380a12e1d10c7f4110102c86233fdf (diff) | |
[FIX] mass_mailing: Traceback on mass mailing list merging
What are the steps to reproduce your issue ?
Try to merge two mailing lists
What is currently happening ?
Traceback
opw-2504230
closes odoo/odoo#69381
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
Diffstat (limited to 'addons/mass_mailing')
| -rw-r--r-- | addons/mass_mailing/tests/test_mailing_list.py | 15 | ||||
| -rw-r--r-- | addons/mass_mailing/wizard/mailing_list_merge.py | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/addons/mass_mailing/tests/test_mailing_list.py b/addons/mass_mailing/tests/test_mailing_list.py index 4a67818ffe9..f2c2f554e05 100644 --- a/addons/mass_mailing/tests/test_mailing_list.py +++ b/addons/mass_mailing/tests/test_mailing_list.py @@ -2,7 +2,7 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from odoo.addons.mass_mailing.tests.common import MassMailCommon -from odoo.tests.common import users +from odoo.tests.common import Form, users class TestMailingListMerge(MassMailCommon): @@ -72,13 +72,12 @@ class TestMailingListMerge(MassMailCommon): # This test ensure that the mailing lists are correctly merged and no # duplicates are appearing in C - result_list = self.env['mailing.list.merge'].create({ - 'src_list_ids': [(4, list_id) for list_id in [self.mailing_list_1.id, self.mailing_list_2.id]], - 'dest_list_id': self.mailing_list_3.id, - 'merge_options': 'existing', - 'new_list_name': False, - 'archive_src_lists': False, - }).action_mailing_lists_merge() + merge_form = Form(self.env['mailing.list.merge'].with_context(active_ids=[self.mailing_list_1.id, self.mailing_list_2.id])) + merge_form.new_list_name = False + merge_form.dest_list_id = self.mailing_list_3 + merge_form.merge_options = 'existing' + merge_form.archive_src_lists = False + result_list = merge_form.save().action_mailing_lists_merge() # Assert the number of contacts is correct self.assertEqual( diff --git a/addons/mass_mailing/wizard/mailing_list_merge.py b/addons/mass_mailing/wizard/mailing_list_merge.py index 0ef97b12fa3..798ac25ebf3 100644 --- a/addons/mass_mailing/wizard/mailing_list_merge.py +++ b/addons/mass_mailing/wizard/mailing_list_merge.py @@ -22,7 +22,7 @@ class MassMailingListMerge(models.TransientModel): res = super(MassMailingListMerge, self).default_get(fields) src_list_ids = self.env.context.get('active_ids') res.update({ - 'src_list_ids': src_list_ids, + 'src_list_ids': [(6, 0, src_list_ids)], 'dest_list_id': src_list_ids and src_list_ids[0] or False, }) return res |