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

[FIX] mail: concatenation of expandable messages 

bzr revid: chm@openerp.com-20121122131827-cap2xfzgjh6ajoss
This commit is contained in:
Christophe Matthieu 2012-11-22 14:18:27 +01:00
parent 5fe04e7ce4
commit 22fe97c509
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -573,12 +573,7 @@ openerp.mail = function (session) {
var message = thread.create_message_object( data[0] );
// insert the message on dom
thread.insert_message( message, root ? undefined : self.$el, root );
if (thread.parent_message) {
self.$el.remove();
self.parent_thread.compose_message = null;
} else {
self.on_cancel();
}
self.on_cancel();
});
//session.web.unblockUI();
});
@ -1291,8 +1286,10 @@ openerp.mail = function (session) {
var messages = _.sortBy( this.messages, function (val) { return val.id; });
var it = _.indexOf( messages, message );
var msg_up = messages[it-1];
var msg_down = messages[it+1];
var msg_up = message.$el.prev('.oe_msg');
var msg_down = message.$el.next('.oe_msg');
var msg_up = msg_up.hasClass('oe_msg_expandable') ? _.find( this.messages, function (val) { return val.$el[0] == msg_up[0]; }) : false;
var msg_down = msg_down.hasClass('oe_msg_expandable') ? _.find( this.messages, function (val) { return val.$el[0] == msg_down[0]; }) : false;
var message_dom = [ ["id", "=", message.id] ];