From 35d5b96d05ffa93bc1cf1ec671b7495927fb3b81 Mon Sep 17 00:00:00 2001 From: Earth Patel Date: Mon, 27 Nov 2023 10:37:42 +0530 Subject: [PATCH] [FIX] mass_mailing: don't autopublish mailing lists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Purpose: - Changed the default value of 'Show In Preference' (is_public) field from true to false for preventing the automatic publishing of mailing lists. Task-3594678 closes odoo/odoo#144699 Signed-off-by: Warnon Aurélien (awa) --- addons/mass_mailing/data/mailing_list_contact.xml | 1 + addons/mass_mailing/demo/mailing_list_contact.xml | 1 + addons/mass_mailing/i18n/mass_mailing.pot | 2 +- addons/mass_mailing/models/mailing_list.py | 4 ++-- addons/mass_mailing/tests/common.py | 4 +++- addons/mass_mailing_sms/demo/mailing_list_contact.xml | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/mass_mailing/data/mailing_list_contact.xml b/addons/mass_mailing/data/mailing_list_contact.xml index 6cadf031483..e8023bf3e9e 100644 --- a/addons/mass_mailing/data/mailing_list_contact.xml +++ b/addons/mass_mailing/data/mailing_list_contact.xml @@ -3,6 +3,7 @@ Newsletter + True diff --git a/addons/mass_mailing/demo/mailing_list_contact.xml b/addons/mass_mailing/demo/mailing_list_contact.xml index 8e788cf2f63..56b20b7738a 100644 --- a/addons/mass_mailing/demo/mailing_list_contact.xml +++ b/addons/mass_mailing/demo/mailing_list_contact.xml @@ -4,6 +4,7 @@ Imported Contacts + False diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot index bc202ec4d05..5f44adca97e 100644 --- a/addons/mass_mailing/i18n/mass_mailing.pot +++ b/addons/mass_mailing/i18n/mass_mailing.pot @@ -4520,7 +4520,7 @@ msgstr "" #: model:ir.model.fields,help:mass_mailing.field_mailing_list__is_public msgid "" "The mailing list can be accessible by recipients in the subscription " -"management page to allows them to update their preferences." +"management page to allow them to update their preferences." msgstr "" #. module: mass_mailing diff --git a/addons/mass_mailing/models/mailing_list.py b/addons/mass_mailing/models/mailing_list.py index 9ad9db8a300..2576d1a287f 100644 --- a/addons/mass_mailing/models/mailing_list.py +++ b/addons/mass_mailing/models/mailing_list.py @@ -38,9 +38,9 @@ class MassMailingList(models.Model): string='Subscription Information', copy=True, depends=['contact_ids']) is_public = fields.Boolean( - string='Show In Preferences', default=True, + string='Show In Preferences', default=False, help='The mailing list can be accessible by recipients in the subscription ' - 'management page to allows them to update their preferences.') + 'management page to allow them to update their preferences.') # ------------------------------------------------------ # COMPUTE / ONCHANGE diff --git a/addons/mass_mailing/tests/common.py b/addons/mass_mailing/tests/common.py index 6eca0bfacc3..d22d5f97e19 100644 --- a/addons/mass_mailing/tests/common.py +++ b/addons/mass_mailing/tests/common.py @@ -312,6 +312,7 @@ class MassMailCase(MailCase, MockLinkTracker): (0, 0, {'name': 'Ybrant', 'email': 'ybrant@example.com'}), ], 'name': 'List1', + 'is_public': True, }, { 'contact_ids': [ (0, 0, {'name': 'Gilberte', 'email': 'gilberte@example.com'}), @@ -320,13 +321,14 @@ class MassMailCase(MailCase, MockLinkTracker): (0, 0, {'name': 'Ybrant', 'email': 'ybrant@example.com'}), ], 'name': 'List2', + 'is_public': True, }, { 'contact_ids': [ (0, 0, {'name': 'Déboulonneur', 'email': 'fleurus@example.com'}), ], 'name': 'List3', + 'is_public': True, }, { - 'is_public': False, 'name': 'List4', } ]) diff --git a/addons/mass_mailing_sms/demo/mailing_list_contact.xml b/addons/mass_mailing_sms/demo/mailing_list_contact.xml index e303c0cef93..6aceff1acbc 100644 --- a/addons/mass_mailing_sms/demo/mailing_list_contact.xml +++ b/addons/mass_mailing_sms/demo/mailing_list_contact.xml @@ -2,6 +2,7 @@ Interested in Tree Promotions + True