From ef9efcdc619ab8bc8845b3ed1b7ba5b74848bb13 Mon Sep 17 00:00:00 2001
From: Rodolpho Lima <rcdl@odoo.com>
Date: Tue, 8 Aug 2023 08:26:14 +0000
Subject: [PATCH] [FIX] web_editor: disable dropImageAsAttachment for mail and
 mailing

This commit deactivates the conversion of pasted or dropped images into
attachments through a controller within the web_editor module. This
alteration applies to mail and mass_mailing modules, as they have their
own mechanism to handle this process.

task-3457541
opw-3448851

X-original-commit: 291ca7496515701737f6940fa27c917ded205aa6
Part-of: odoo/odoo#131975
---
 addons/mass_mailing/static/src/js/mass_mailing_html_field.js | 1 +
 addons/web_editor/static/src/js/wysiwyg/wysiwyg.js           | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/addons/mass_mailing/static/src/js/mass_mailing_html_field.js b/addons/mass_mailing/static/src/js/mass_mailing_html_field.js
index 088c80acdf0..81913b00949 100644
--- a/addons/mass_mailing/static/src/js/mass_mailing_html_field.js
+++ b/addons/mass_mailing/static/src/js/mass_mailing_html_field.js
@@ -70,6 +70,7 @@ export class MassMailingHtmlField extends HtmlField {
                 this.commitChanges();
                 this.wysiwyg.odooEditor.toolbarHide();
             },
+            dropImageAsAttachment: false,
             ...this.props.wysiwygOptions,
         };
     }
diff --git a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
index 2fb7476e9f1..c2a7d8f1ae3 100644
--- a/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
+++ b/addons/web_editor/static/src/js/wysiwyg/wysiwyg.js
@@ -2264,6 +2264,9 @@ export class Wysiwyg extends Component {
         finalOptions.autohideToolbar = typeof finalOptions.autohideToolbar === 'boolean'
             ? finalOptions.autohideToolbar
             : !finalOptions.snippets;
+        if (finalOptions.inlineStyle) {
+            finalOptions.dropImageAsAttachment = false;
+        }
 
         return finalOptions;
     }