Merge PR #883 into 13.0

Signed-off-by etobella

mail_restrict_follower_selection/models/mail_followers.py

@@ -21,7 +21,7 @@ class MailFollowers(models.Model):
     ):
         domain = self.env[
             "mail.wizard.invite"
-        ]._mail_restrict_follower_selection_get_domain()
+        ]._mail_restrict_follower_selection_get_domain(res_model=res_model)
         partners = self.env["res.partner"].search(
             [("id", "in", partner_ids)] + safe_eval(domain)
         )

mail_restrict_follower_selection/models/mail_wizard_invite.py

@@ -11,15 +11,15 @@ class MailWizardInvite(models.TransientModel):
     _inherit = "mail.wizard.invite"
 
     @api.model
-    def _mail_restrict_follower_selection_get_domain(self):
+    def _mail_restrict_follower_selection_get_domain(self, res_model=None):
+        if not res_model:
+            res_model = self.env.context.get("default_res_model")
         parameter_name = "mail_restrict_follower_selection.domain"
         return (
             self.env["ir.config_parameter"]
             .sudo()
             .get_param(
-                "{}.{}".format(
-                    parameter_name, self.env.context.get("default_res_model")
-                ),
+                "{}.{}".format(parameter_name, res_model),
                 self.env["ir.config_parameter"]
                 .sudo()
                 .get_param(parameter_name, default="[]"),

mail_restrict_follower_selection/tests/test_mail_restrict_follower_selection.py

@@ -65,3 +65,19 @@ class TestMailRestrictFollowerSelection(TransactionCase):
         self.assertNotIn(
             self.partner, self.partner.message_follower_ids.mapped("partner_id")
         )
+
+    def test_message_add_suggested_recipient(self):
+        res = self.partner.with_context(
+            test_restrict_follower=True
+        )._message_add_suggested_recipient({self.partner.id: []}, partner=self.partner)
+        self.assertEqual(res[self.partner.id][0][0], self.partner.id)
+        self.env["ir.config_parameter"].create(
+            {
+                "key": "mail_restrict_follower_selection.domain.res.partner",
+                "value": "[('category_id.name', '!=', 'Employees')]",
+            }
+        )
+        new_res = self.partner.with_context(
+            test_restrict_follower=True
+        )._message_add_suggested_recipient({self.partner.id: []})
+        self.assertFalse(new_res[self.partner.id][0][0])