From 6a5dc8bcd1310e1cd326026d64769a400a075202 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Wed, 11 Jul 2018 14:47:33 +0200
Subject: [PATCH] [FIX] mail: remove attachment feature in add followers modal

Before this fix, the attachments are don't save to the record and are
remove with the wizard. We can't add the attachments to mail.message
(like 'mail.compose.message') because it's auto_delete/unlink and the
attachments are removed before the recipient can read it.
---
 addons/mail/wizard/invite_view.xml                | 2 +-
 addons/web_editor/static/src/js/backend/fields.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/mail/wizard/invite_view.xml b/addons/mail/wizard/invite_view.xml
index f9f9cb30b23..d64e10f387d 100644
--- a/addons/mail/wizard/invite_view.xml
+++ b/addons/mail/wizard/invite_view.xml
@@ -20,7 +20,7 @@
                                 invisible="not context.get('mail_invite_follower_channel_only')"
                                 options="{'no_create': True}"/>
                         <field name="send_mail" invisible="context.get('mail_invite_follower_channel_only')"/>
-                        <field name="message" attrs="{'invisible': [('send_mail','!=',True)]}" options="{'style-inline': true}" class="test_message"/>
+                        <field name="message" attrs="{'invisible': [('send_mail','!=',True)]}" options="{'style-inline': true, 'no-attachment': true}" class="test_message"/>
                     </group>
                     <footer>
                         <button string="Add Followers"
diff --git a/addons/web_editor/static/src/js/backend/fields.js b/addons/web_editor/static/src/js/backend/fields.js
index cfa88e02f6e..1042c0ae0b4 100644
--- a/addons/web_editor/static/src/js/backend/fields.js
+++ b/addons/web_editor/static/src/js/backend/fields.js
@@ -136,7 +136,7 @@ var FieldTextHtmlSimple = basic_fields.DebouncedField.extend(TranslatableFieldMi
                 ['color', ['color']],
                 ['para', ['ul', 'ol', 'paragraph']],
                 ['table', ['table']],
-                ['insert', ['link', 'picture']],
+                ['insert', this.nodeOptions['no-attachment'] ? ['link'] : ['link', 'picture']],
                 ['history', ['undo', 'redo']]
             ],
             prettifyHtml: false,
@@ -144,6 +144,7 @@ var FieldTextHtmlSimple = basic_fields.DebouncedField.extend(TranslatableFieldMi
             inlinemedia: ['p'],
             lang: "odoo",
             onChange: this._doDebouncedAction.bind(this),
+            disableDragAndDrop: !!this.nodeOptions['no-attachment'],
         };
 
         var fieldNameAttachment =_.chain(this.recordData)