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

[MERGE] Fix a bug related to Chatter when switching records in form view: 

- when simply switching, old messages were concatenated
- when deleting a record, a crash occured

bzr revid: tde@openerp.com-20121113153353-jrl2hguv01oupam5
This commit is contained in:
Thibault Delavallée 2012-11-13 16:33:53 +01:00
parent 866956daa6 183bc922c1
commit f736edb150
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1530,7 +1530,6 @@ openerp.mail = function (session) {
'display_indented_thread': -1,
'show_reply_button': false,
'show_read_unread_button': false,
'show_compose_message': this.view.is_action_enabled('edit'),
'show_compact_message': 1,
}, this.node.params);
@ -1556,9 +1555,10 @@ openerp.mail = function (session) {
return;
}
this.node.params = _.extend({
'message_ids': this.getParent().fields.message_ids ? this.getParent().fields.message_ids.get_value() : undefined,
}, this.node.params);
this.node.params = _.extend(this.node.params, {
'message_ids': this.get_value(),
'show_compose_message': this.view.is_action_enabled('edit'),
});
this.node.context = {
'default_res_id': this.view.datarecord.id || false,
'default_model': this.view.model || false,
@ -1571,7 +1571,6 @@ openerp.mail = function (session) {
// create and render Thread widget
this.root = new mail.Widget(this, _.extend(this.node, {
'domain' : (this.domain || []).concat([['model', '=', this.view.model], ['res_id', '=', this.view.datarecord.id]]),
}));
return this.root.replace(this.$('.oe_mail-placeholder'));