From f4332118d3156e2ba2408c1d31ab92ee2066ef73 Mon Sep 17 00:00:00 2001 From: Nicolas Lempereur Date: Fri, 13 Oct 2017 15:23:58 +0200 Subject: [FIX] mass_mailing: unsubscribe error if contacts If the mass mailing was to mail contacts, this could cause an error if the recipient unsubscribed. If the mass mailing was to mailing list, unsubscribe would not work. This change update unsubscribe to take into account changes in 765e752 and e15372c07 that allowed mailing list / mailing list contacts to be used separately. opw-770473 closes #20145 --- addons/mass_mailing/controllers/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/mass_mailing/controllers/main.py') diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py index 276056311b8..2b93d4706d5 100644 --- a/addons/mass_mailing/controllers/main.py +++ b/addons/mass_mailing/controllers/main.py @@ -16,10 +16,10 @@ class MassMailController(http.Controller): if mailing.exists(): res_id = res_id and int(res_id) res_ids = [] - if mailing.mailing_model == 'mail.mass_mailing.contact': + if mailing.mailing_model == 'mail.mass_mailing.list': contacts = request.env['mail.mass_mailing.contact'].sudo().search([ ('email', '=', email), - ('list_id', 'in', [mailing_list.id for mailing_list in mailing.contact_list_ids]) + ('list_ids', 'in', [mailing_list.id for mailing_list in mailing.contact_list_ids]) ]) res_ids = contacts.ids else: -- cgit v1.2.3