[IMP] mail, mass_mailing, crm : stringify _primary_email

_primary_email was an array to be able to use it directly in the
depends. Typically a 'depends' with a computed value (lambda) needs
an array. Otherwise, it will only take the first character of the
field name string.

By setting _primary_email as a string, the lambda should always get
an array. But it simplifies a lot the usage of the _primary_email.
also, having an array was confusing as we could think that more than
one field can be considered as the primary email. This is not the
goal hare. So having the _primary_email as a single string is more
'self describing'. Only one field should be the _primary_email.

2 files changed, 4 insertions, 12 deletions

diff --git a/addons/test_mass_mailing/models/mass_mail_test.py b/addons/test_mass_mailing/models/mass_mail_test.py
index ac9d3eeb65a..f42fe1c872e 100644
--- a/addons/test_mass_mailing/models/mass_mail_test.py
+++ b/addons/test_mass_mailing/models/mass_mail_test.py
@@ -10,7 +10,7 @@ class MassMailTest(models.Model):
     _description = 'Simple Mass Mailing Model'
     _name = 'mass.mail.test'
     _inherit = ['mail.thread', 'mail.address.mixin']
-    _primary_email = ['email_from']
+    _primary_email = 'email_from'
 
     name = fields.Char()
     email_from = fields.Char()
@@ -22,7 +22,7 @@ class MassMailTestBlacklist(models.Model):
     _name = 'mass.mail.test.bl'
     _inherit = ['mail.thread', 'mail.blacklist.mixin']
 
-    _primary_email = ['email_from']  # blacklist field to check
+    _primary_email = 'email_from'  # blacklist field to check
 
     name = fields.Char()
     email_from = fields.Char()
diff --git a/addons/test_mass_mailing/tests/test_blacklist_mixin.py b/addons/test_mass_mailing/tests/test_blacklist_mixin.py
index 0760b90f5e2..0e7b167f5e7 100644
--- a/addons/test_mass_mailing/tests/test_blacklist_mixin.py
+++ b/addons/test_mass_mailing/tests/test_blacklist_mixin.py
@@ -25,23 +25,15 @@ class TestBLMixin(common.MassMailingCase):
 
     @users('emp')
     def test_bl_mixin_primary_field_consistency(self):
-        MassMailTestBlacklist._primary_email = ['not_a_field']
+        MassMailTestBlacklist._primary_email = 'not_a_field'
         with self.assertRaises(UserError):
             self.env['mass.mail.test.bl'].search([('is_blacklisted', '=', False)])
 
-        MassMailTestBlacklist._primary_email = 'not_a_list'
+        MassMailTestBlacklist._primary_email = ['not_a_str']
         with self.assertRaises(UserError):
             self.env['mass.mail.test.bl'].search([('is_blacklisted', '=', False)])
 
         MassMailTestBlacklist._primary_email = 'email_from'
-        with self.assertRaises(UserError):
-            self.env['mass.mail.test.bl'].search([('is_blacklisted', '=', False)])
-
-        MassMailTestBlacklist._primary_email = ['email_from', 'name']
-        with self.assertRaises(UserError):
-            self.env['mass.mail.test.bl'].search([('is_blacklisted', '=', False)])
-
-        MassMailTestBlacklist._primary_email = ['email_from']
         self.env['mass.mail.test.bl'].search([('is_blacklisted', '=', False)])
 
     @users('emp')