[FIX] mail: check alias contact

Correctly verify method existance before calling it.
2017-08-09 12:44:13 +02:00
parent 99e38c04bf
commit 0c13beb0cc
1 changed files with 7 additions and 4 deletions
@@ -947,11 +947,14 @@ class MailThread(models.AbstractModel):

        # Alias: check alias_contact settings
        if alias:
-            if alias.alias_parent_model_id and alias.alias_parent_thread_id:
+            obj = None
+            if thread_id:
+                obj = record_set[0]
+            elif alias.alias_parent_model_id and alias.alias_parent_thread_id:
                obj = self.env[alias.alias_parent_model_id.model].browse(alias.alias_parent_thread_id)
-            elif model and hasattr(record_set, '_alias_check_contact'):
-                obj = record_set[0] if thread_id else self.env[model]
-            else:
+            elif model:
+                obj = self.env[model]
+            if not hasattr(obj, '_alias_check_contact'):
                obj = self.env['mail.alias.mixin']
            check_result = obj._alias_check_contact(message, message_dict, alias)
            if check_result is not True: