From 48e3bdb3322a743e1941f3d42dbccac5f0cf20ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 14 Nov 2012 11:53:23 +0100 Subject: [PATCH] [IMP] mail_thread: incoming messages without model that are reply to a private message shoudl not have any res_id. Assert it. bzr revid: tde@openerp.com-20121114105323-5an5v6m7bdaaomy1 --- addons/mail/mail_thread.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 6d498eab8ad..d18d056e439 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -339,7 +339,7 @@ class mail_thread(osv.AbstractModel): message_ids = self.pool.get('mail.message').search(cr, uid, [('message_id', '=', in_reply_to)], limit=1, context=context) if message_ids: message = self.pool.get('mail.message').browse(cr, uid, message_ids[0], context=context) - _logger.debug('Routing mail with Message-Id %s: reply to a private message: %s, custom_values: %s, uid: %s', + _logger.debug('Routing mail with Message-Id %s: direct reply to a private message: %s, custom_values: %s, uid: %s', message_id, message.id, custom_values, uid) return [(False, 0, custom_values, uid)] @@ -450,6 +450,7 @@ class mail_thread(osv.AbstractModel): else: thread_id = model_pool.message_new(cr, user_id, msg, custom_values, context=context) else: + assert thread_id == 0, "Posting a message without model should be with a null res_id, to create a private message." model_pool = self.pool.get('mail.thread') model_pool.message_post_user_api(cr, uid, [thread_id], context=context, content_subtype='html', **msg) return thread_id