[MERGE] form trunk-openchatter-needaction-chm + code review

bzr revid: chm@openerp.com-20121113131448-ebt0sr5it4lbk1l1
This commit is contained in:
Christophe Matthieu 2012-11-13 14:14:48 +01:00
commit 99354ab558
1 changed files with 18 additions and 2 deletions

View File

@ -860,7 +860,10 @@ openerp.mail = function (session) {
msg.animated_destroy(150);
} else {
msg.renderElement();
msg.start()
msg.start();
}
if( self.options.root_thread.__parentedParent.__parentedParent.get_menu_emails ) {
self.options.root_thread.__parentedParent.__parentedParent.get_menu_emails().do_reload();
}
});
@ -1630,7 +1633,20 @@ openerp.mail = function (session) {
if (! this.searchview.has_defaults) {
this.message_render();
}
},
/**
* crete an object "related_menu"
* contain the menu widget and the the sub menu related of this wall
*/
get_menu_emails: function () {
var self = this;
if (!this.related_menu) {
var menu = this.__parentedParent.__parentedParent.menu;
var sub_menu = _.filter(menu.data.data.children, function (val) {return val.id == 100;})[0];
this.related_menu = menu;
}
return this.related_menu;
},
/**