odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Chatter: fixed calls to refactored methos. 

bzr revid: tde@openerp.com-20130416134405-nxtwbvxbz77pxufx
This commit is contained in:
Thibault Delavallée 2013-04-16 15:44:05 +02:00
parent c7897690e2
commit c1a0489156
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/mail/mail_thread.py
View File

@ -705,7 +705,6 @@ class mail_thread(osv.AbstractModel):
# check for author
if not author_id:
email_from = decode(message.get('From'))
author_ids = model_pool._find_partner_from_emails(cr, uid, thread_id, [email_from], context=context)
if author_ids:
author_id = author_ids[0]

11
addons/mail/static/src/js/mail.js
View File

@ -620,10 +620,7 @@ openerp.mail = function (session) {
// have unknown names -> call message_get_partner_info_from_emails to try to find partner_id
var find_done = $.Deferred();
if (names_to_find.length > 0) {
var values = {
'res_id': this.context.default_res_id,
}
find_done = self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [names_to_find], values);
find_done = self.parent_thread.ds_thread._model.call('message_partner_info_from_emails', [this.context.default_res_id, names_to_find]);
}
else {
find_done.resolve([]);
@ -669,11 +666,7 @@ openerp.mail = function (session) {
var new_names_to_find = _.difference(names_to_find, names_to_remove);
find_done = $.Deferred();
if (new_names_to_find.length > 0) {
var values = {
'link_mail': true,
'res_id': self.context.default_res_id,
}
find_done = self.parent_thread.ds_thread._model.call('message_get_partner_info_from_emails', [new_names_to_find], values);
find_done = self.parent_thread.ds_thread._model.call('message_partner_info_from_emails', [self.context.default_res_id, new_names_to_find, true]);
}
else {
find_done.resolve([]);