diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-10-19 13:27:00 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-10-19 13:27:00 +0200 |
| commit | b366eee770fec8be921bd311a23c8ad4c7482ea6 (patch) | |
| tree | 87e7f6874003b28a365c3d086cc7757858e1c1dc | |
| parent | c3a27390ebbfda3dd3fe908e90384a62e26a035e (diff) | |
[FIX] mail.js: fixed wrong parent in subthreads (self not defined), fixed wront default model and res_id given to the mail.compose.message wizard.
bzr revid: tde@openerp.com-20121019112700-7d60uqz8tt7ka9u1
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index bd9ba6ef6f7..baa9354d9b3 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -278,7 +278,6 @@ openerp.mail = function(session) { for(var i in this.datasets.partner_ids){ partner_ids.push(this.datasets.partner_ids[i][0]); } - var action = { type: 'ir.actions.act_window', res_model: 'mail.compose.message', @@ -288,10 +287,10 @@ openerp.mail = function(session) { views: [[false, 'form']], target: 'new', context: { - 'default_model': false, - 'default_res_id': 0, + 'default_model': this.context.default_model, + 'default_res_id': this.context.default_res_id, 'default_content_subtype': 'html', - 'default_parent_id': this.datasets.id, + 'default_parent_id': this.context.default_parent_id, 'default_body': mail.ChatterUtils.get_text2html(this.$('textarea').val() || ''), 'default_attachment_ids': attachments, 'default_partner_ids': partner_ids @@ -1220,6 +1219,7 @@ openerp.mail = function(session) { this.$el.toggle(this.view.get("actual_mode") !== "create"); }, render_value: function() { + var self = this; if (! this.view.datarecord.id || session.web.BufferedDataSet.virtual_id_regex.test(this.view.datarecord.id)) { this.$('oe_mail_thread').hide(); return; |