[IMP] mass_mailing: better management of contacts lists

1 files changed, 3 insertions, 3 deletions

diff --git a/addons/website_mass_mailing/controllers/main.py b/addons/website_mass_mailing/controllers/main.py
index ff3a515b4fb..d5b23030717 100644
--- a/addons/website_mass_mailing/controllers/main.py
+++ b/addons/website_mass_mailing/controllers/main.py
@@ -38,7 +38,7 @@ class MassMailController(MassMailController):
 
         is_subscriber = False
         if email:
-            contacts_count = request.env['mail.mass_mailing.contact'].sudo().search_count([('list_id', '=', int(list_id)), ('email', '=', email), ('opt_out', '=', False)])
+            contacts_count = request.env['mail.mass_mailing.contact'].sudo().search_count([('list_ids', 'in', [int(list_id)]), ('email', '=', email), ('opt_out', '=', False)])
             is_subscriber = contacts_count > 0
 
         return {'is_subscriber': is_subscriber, 'email': email}
@@ -49,12 +49,12 @@ class MassMailController(MassMailController):
         name, email = Contacts.get_name_email(email)
 
         contact_ids = Contacts.search([
-            ('list_id', '=', int(list_id)),
+            ('list_ids', 'in', [int(list_id)]),
             ('email', '=', email),
         ], limit=1)
         if not contact_ids:
             # inline add_to_list as we've already called half of it
-            Contacts.create({'name': name, 'email': email, 'list_id': int(list_id)})
+            Contacts.create({'name': name, 'email': email, 'list_ids': [(6,0,[int(list_id)])]})
         elif contact_ids.opt_out:
             contact_ids.opt_out = False
         # add email to session