From cdcb4638d9c91ac1c8f134b7c6abec582b5d1ab3 Mon Sep 17 00:00:00 2001
From: Xavier Dubuc <xdu@odoo.com>
Date: Thu, 2 Jul 2020 12:32:39 +0000
Subject: [PATCH] [FIX] mail: do not let chatter to be rendered if form view is
 in dialog
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

task-2280151

closes odoo/odoo#54157

X-original-commit: 83f2a0605ad80cb8b544651b47b7d27e11b332cb
Signed-off-by: Alexandre Kühn (aku) <aku@odoo.com>
---
 .../static/src/widgets/form_renderer/form_renderer.js    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/addons/mail/static/src/widgets/form_renderer/form_renderer.js b/addons/mail/static/src/widgets/form_renderer/form_renderer.js
index 52f2d962ba2..8e4ca059580 100644
--- a/addons/mail/static/src/widgets/form_renderer/form_renderer.js
+++ b/addons/mail/static/src/widgets/form_renderer/form_renderer.js
@@ -145,11 +145,10 @@ FormRenderer.include({
      * @override
      */
     _renderNode(node) {
-        if (
-            !this._isFromFormViewDialog &&
-            node.tag === 'div' &&
-            node.attrs.class === 'oe_chatter'
-        ) {
+        if (node.tag === 'div' && node.attrs.class === 'oe_chatter') {
+            if (this._isFromFormViewDialog) {
+                return $('<div/>');
+            }
             return this._makeChatterContainerTarget();
         }
         return this._super(...arguments);