diff options
Diffstat (limited to 'addons/mail/mail_thread.py')
| -rw-r--r-- | addons/mail/mail_thread.py | 53 |
1 files changed, 36 insertions, 17 deletions
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py index 04da686b49d..e986f12b822 100644 --- a/addons/mail/mail_thread.py +++ b/addons/mail/mail_thread.py @@ -554,7 +554,11 @@ class mail_thread(osv.AbstractModel): ('file2', 'bytes')} } """ - msg_dict = {} + msg_dict = { + 'type': 'email', + 'subtype': 'mail.mt_comment', + 'author_id': False, + } if not isinstance(message, Message): if isinstance(message, unicode): # Warning: message_from_string doesn't always work correctly on unicode, @@ -572,7 +576,7 @@ class mail_thread(osv.AbstractModel): if 'Subject' in message: msg_dict['subject'] = decode(message.get('Subject')) - # Envelope fields not stored in mail.message but made available for message_new() + # Envelope fields not stored in mail.message but made available for message_new() msg_dict['from'] = decode(message.get('from')) msg_dict['to'] = decode(message.get('to')) msg_dict['cc'] = decode(message.get('cc')) @@ -581,6 +585,8 @@ class mail_thread(osv.AbstractModel): author_ids = self._message_find_partners(cr, uid, message, ['From'], context=context) if author_ids: msg_dict['author_id'] = author_ids[0] + else: + msg_dict['email_from'] = message.get('from') partner_ids = self._message_find_partners(cr, uid, message, ['From', 'To', 'Cc'], context=context) msg_dict['partner_ids'] = partner_ids @@ -670,6 +676,18 @@ class mail_thread(osv.AbstractModel): if self._mail_flat_thread and not parent_id and thread_id: message_ids = mail_message.search(cr, uid, ['&', ('res_id', '=', thread_id), ('model', '=', model)], context=context, order="id ASC", limit=1) parent_id = message_ids and message_ids[0] or False + # we want to set a parent: force to set the parent_id to the oldest ancestor, to avoid having more than 1 level of thread + elif parent_id: + message_ids = mail_message.search(cr, SUPERUSER_ID, [('id', '=', parent_id), ('parent_id', '!=', False)], context=context) + # avoid loops when finding ancestors + processed_list = [] + if message_ids: + _counter, _counter_max = 0, 200 + message = mail_message.browse(cr, SUPERUSER_ID, message_ids[0], context=context) + while (message.parent_id and message.parent_id.id not in processed_list): + processed_list.append(message.parent_id.id) + message = message.parent_id + parent_id = message.id values = kwargs values.update({ @@ -689,27 +707,28 @@ class mail_thread(osv.AbstractModel): return mail_message.create(cr, uid, values, context=context) - def message_post_api(self, cr, uid, thread_id, body='', subject=False, type='notification', - subtype=None, parent_id=False, attachments=None, context=None, **kwargs): - # TDE FIXME: body is plaintext: convert it into html - # when writing on res.partner, without specific thread_id -> redirect to the user's partner - if self._name == 'res.partner' and not thread_id: - thread_id = self.pool.get('res.users').read(cr, uid, uid, ['partner_id'], context=context)['partner_id'][0] - - new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type=type, - subtype=subtype, parent_id=parent_id, context=context) + def message_post_api(self, cr, uid, thread_id, body='', subject=False, parent_id=False, attachment_ids=None, context=None): + """ Wrapper on message_post, used only in Chatter (JS). The purpose is + to handle attachments. + # TDE FIXME: body is plaintext: convert it into html + """ + new_message_id = self.message_post(cr, uid, thread_id=thread_id, body=body, subject=subject, type='comment', + subtype='mail.mt_comment', parent_id=parent_id, context=context) - # Chatter: attachments linked to the document (not done JS-side), load the message - if attachments: + # HACK FIXME: Chatter: attachments linked to the document (not done JS-side), load the message + if attachment_ids: ir_attachment = self.pool.get('ir.attachment') mail_message = self.pool.get('mail.message') - attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [('res_model', '=', 'mail.message'), ('res_id', '=', 0), ('create_uid', '=', uid), ('id', 'in', attachments)], context=context) - if attachment_ids: + filtered_attachment_ids = ir_attachment.search(cr, SUPERUSER_ID, [ + ('res_model', '=', 'mail.compose.message'), + ('res_id', '=', 0), + ('create_uid', '=', uid), + ('id', 'in', attachment_ids)], context=context) + if filtered_attachment_ids: ir_attachment.write(cr, SUPERUSER_ID, attachment_ids, {'res_model': self._name, 'res_id': thread_id}, context=context) mail_message.write(cr, SUPERUSER_ID, [new_message_id], {'attachment_ids': [(6, 0, [pid for pid in attachment_ids])]}, context=context) - new_message = self.pool.get('mail.message').message_read(cr, uid, [new_message_id], context=context) - return new_message + return new_message_id #------------------------------------------------------ # Followers API |