From 5b885bf771e183cf8e9607ce86c9403161f62c3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aurelija=20Vitkauskien=C4=97?= Date: Mon, 16 Dec 2024 17:04:59 +0200 Subject: [PATCH] [MIG] mail_restrict_follower_selection: Migration to 17.0 --- mail_restrict_follower_selection/__manifest__.py | 2 +- mail_restrict_follower_selection/models/mail_thread.py | 4 ++-- mail_restrict_follower_selection/models/mail_wizard_invite.py | 4 +--- .../tests/test_mail_restrict_follower_selection.py | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/mail_restrict_follower_selection/__manifest__.py b/mail_restrict_follower_selection/__manifest__.py index 613e92366d..84eb63beb0 100644 --- a/mail_restrict_follower_selection/__manifest__.py +++ b/mail_restrict_follower_selection/__manifest__.py @@ -4,7 +4,7 @@ { "name": "Restrict follower selection", - "version": "16.0.1.0.0", + "version": "17.0.1.0.0", "author": "Therp BV,Creu Blanca,Odoo Community Association (OCA)", "license": "AGPL-3", "category": "Social Network", diff --git a/mail_restrict_follower_selection/models/mail_thread.py b/mail_restrict_follower_selection/models/mail_thread.py index 29d2ac1758..4f93c20c43 100644 --- a/mail_restrict_follower_selection/models/mail_thread.py +++ b/mail_restrict_follower_selection/models/mail_thread.py @@ -20,11 +20,11 @@ def _message_add_suggested_recipient( "mail.wizard.invite" ]._mail_restrict_follower_selection_get_domain() for key in result: - for partner_id, email, lang, reason in result[key]: + for partner_id, *_values in result[key]: if partner_id: partner = self.env["res.partner"].search_count( [("id", "=", partner_id)] + domain ) if not partner: - result[key].remove((partner_id, email, lang, reason)) + result[key].remove((partner_id, *_values)) return result diff --git a/mail_restrict_follower_selection/models/mail_wizard_invite.py b/mail_restrict_follower_selection/models/mail_wizard_invite.py index a24ce7a6b6..f08165dc4f 100644 --- a/mail_restrict_follower_selection/models/mail_wizard_invite.py +++ b/mail_restrict_follower_selection/models/mail_wizard_invite.py @@ -35,9 +35,7 @@ def _mail_restrict_follower_selection_get_domain(self, res_model=None): @api.model def get_view(self, view_id=None, view_type="form", **options): - result = super(MailWizardInvite, self).get_view( - view_id=view_id, view_type=view_type, **options - ) + result = super().get_view(view_id=view_id, view_type=view_type, **options) arch = etree.fromstring(result["arch"]) for field in arch.xpath('//field[@name="partner_ids"]'): field.attrib["domain"] = str( diff --git a/mail_restrict_follower_selection/tests/test_mail_restrict_follower_selection.py b/mail_restrict_follower_selection/tests/test_mail_restrict_follower_selection.py index e350aa06ff..cb524b9f04 100644 --- a/mail_restrict_follower_selection/tests/test_mail_restrict_follower_selection.py +++ b/mail_restrict_follower_selection/tests/test_mail_restrict_follower_selection.py @@ -47,7 +47,7 @@ def send_action(self): { "subject": "From Composer Test", "body": "${object.description}", - "res_id": self.partner.id, + "res_ids": self.partner.ids, "partner_ids": [(4, id) for id in self.partner.ids], } )