diff options
| author | Raphael Collet <rco@odoo.com> | 2021-01-12 12:40:38 +0000 |
|---|---|---|
| committer | Raphael Collet <rco@odoo.com> | 2021-01-13 08:12:53 +0000 |
| commit | c01657d345f59e3ccea70a5004732050fae99320 (patch) | |
| tree | 1a3d132d8869f8c6ea8eb8ee85d9b11008357c4e | |
| parent | 2ccc735253405b03927e2b08eab57427e65e4050 (diff) | |
[REV] mass_mailing: correctly support mailing domain from default context value
This partially reverts commit 1ec887b773581b6316902997fec94176bbae1ac0,
which was a hack to deal with the issue. From now on, the first call to
onchange() no longer computes editable fields when they are given a
default value.
| -rw-r--r-- | addons/mass_mailing/models/mailing.py | 12 | ||||
| -rw-r--r-- | addons/mass_mailing/tests/test_mailing_internals.py | 2 |
2 files changed, 2 insertions, 12 deletions
diff --git a/addons/mass_mailing/models/mailing.py b/addons/mass_mailing/models/mailing.py index abc63381bf7..58c7f0aaf21 100644 --- a/addons/mass_mailing/models/mailing.py +++ b/addons/mass_mailing/models/mailing.py @@ -755,19 +755,9 @@ class MassMailing(models.Model): # ------------------------------------------------------ def _get_default_mailing_domain(self): - default_mailing_domain = self.default_get(['mailing_domain']).get('mailing_domain') + mailing_domain = [] if self.mailing_model_name == 'mailing.list' and self.contact_list_ids: mailing_domain = [('list_ids', 'in', self.contact_list_ids.ids)] - elif default_mailing_domain: - default_mailing_domain = literal_eval(default_mailing_domain) if isinstance(default_mailing_domain, str) else default_mailing_domain - try: - self.env[self.mailing_model_real].search(default_mailing_domain, limit=1) - except: - mailing_domain = [] - else: - mailing_domain = default_mailing_domain - else: - mailing_domain = [] if self.mailing_type == 'mail' and 'is_blacklisted' in self.env[self.mailing_model_name]._fields: mailing_domain = expression.AND([[('is_blacklisted', '=', False)], mailing_domain]) diff --git a/addons/mass_mailing/tests/test_mailing_internals.py b/addons/mass_mailing/tests/test_mailing_internals.py index 0f7a9a831e9..115736e987d 100644 --- a/addons/mass_mailing/tests/test_mailing_internals.py +++ b/addons/mass_mailing/tests/test_mailing_internals.py @@ -117,7 +117,7 @@ class TestMassMailValues(MassMailCommon): )) self.assertEqual( literal_eval(mailing_form.mailing_domain), - ['&', ('is_blacklisted', '=', False), ('email', 'ilike', 'test.example.com')] + [('email', 'ilike', 'test.example.com')], ) self.assertEqual(mailing_form.mailing_model_real, 'res.partner') |