From fe2c1020d1e7a0b719baefb312fdfab0cd516c25 Mon Sep 17 00:00:00 2001
From: Aaron Bohy <aab@odoo.com>
Date: Tue, 20 Oct 2015 21:34:52 +0200
Subject: [PATCH] [FIX] mail: chatter: undefined context for internal notes

Commit 4f9c9ad adds the context to the RPC call of 'message_post', but the
context was only defined for messages sent, and not for internal notes logged.
This causes a crash when logging a note on a calendar event as its method
'message_post' makes the assumption that it always exists, and tries to access
one of its keys.

opw-652470
Closes #9164
---
 addons/mail/static/src/js/chatter.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js
index bdee2fe06dc..56e5c2e7ff9 100644
--- a/addons/mail/static/src/js/chatter.js
+++ b/addons/mail/static/src/js/chatter.js
@@ -485,6 +485,7 @@ var ChatterComposer = ChatComposer.extend({
                 subtype: 'mail.mt_comment',
                 message_type: 'comment',
                 content_subtype: 'html',
+                context: self.context,
             });
 
             // Subtype
@@ -503,7 +504,7 @@ var ChatterComposer = ChatComposer.extend({
                 self.check_suggested_partners(checked_suggested_partners).done(function (partner_ids) {
                     message.partner_ids = (message.partner_ids || []).concat(partner_ids);
                     // update context
-                    message.context = _.defaults(self.context, {
+                    message.context = _.defaults({}, message.context, {
                         mail_post_autofollow: true,
                     });
                     def.resolve(message);