From 4d79649b55332edefec1e445d4219e85fd95ab35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 19 Nov 2012 12:41:25 +0100
Subject: [PATCH] [REV] Removed fix, to be inserted in a specific branch.

bzr revid: tde@openerp.com-20121119114125-51fhctk8n79ptx65
---
 addons/mail/static/src/js/mail.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js
index 6646b7a289b..72c40ea141b 100644
--- a/addons/mail/static/src/js/mail.js
+++ b/addons/mail/static/src/js/mail.js
@@ -226,21 +226,21 @@ openerp.mail = function (session) {
                 default_parent_id: false }, options.context || {});
 
             // data of this message
-            this.id = datasets.id || false,
+            this.id = datasets.id ||  false,
             this.last_id = this.id,
             this.model = datasets.model || this.context.default_model || false,
-            this.res_id = datasets.res_id || this.context.default_res_id || false,
-            this.parent_id = datasets.parent_id || false,
-            this.type = datasets.type || false,
-            this.is_author = datasets.is_author || false,
-            this.is_private = datasets.is_private || false,
-            this.subject = datasets.subject || false,
-            this.name = datasets.name || false,
-            this.record_name = datasets.record_name || false,
-            this.body = datasets.body || '',
+            this.res_id = datasets.res_id || this.context.default_res_id ||  false,
+            this.parent_id = datasets.parent_id ||  false,
+            this.type = datasets.type ||  false,
+            this.is_author = datasets.is_author ||  false,
+            this.is_private = datasets.is_private ||  false,
+            this.subject = datasets.subject ||  false,
+            this.name = datasets.name ||  false,
+            this.record_name = datasets.record_name ||  false,
+            this.body = datasets.body ||  false,
             this.vote_nb = datasets.vote_nb || 0,
-            this.has_voted = datasets.has_voted || false,
-            this.is_favorite = datasets.is_favorite || false,
+            this.has_voted = datasets.has_voted ||  false,
+            this.is_favorite = datasets.is_favorite ||  false,
             this.thread_level = datasets.thread_level ||  0,
             this.to_read = datasets.to_read || false,
             this.author_id = datasets.author_id || false,
@@ -592,7 +592,7 @@ openerp.mail = function (session) {
                 this.parent_thread.ds_thread.call('message_post_user_api', [
                         this.context.default_res_id, 
                         body, 
-                       false, 
+                        false, 
                         this.context.default_parent_id, 
                         attachments,
                         this.parent_thread.context