From 69ea40215bb39dd84ce2e28976e7bf9ee7b71ca8 Mon Sep 17 00:00:00 2001 From: Nicolas Bayet Date: Tue, 11 Jan 2022 10:51:39 +0000 Subject: [PATCH] [FIX] mass_mailing: show media modal when fullcreen Whenever the user clicked on the fullscreen in mass_maliing, then trying to show the media modal was not possible as the div that contains it was hidden. Task-2731907 closes odoo/odoo#85314 X-original-commit: 4026bc2075b7109dd18471aabf11ff3f76d6c57d Signed-off-by: David Monjoie (dmo) --- addons/web/static/src/legacy/js/views/basic/basic_renderer.js | 1 + addons/web/static/tests/helpers/cleanup.js | 2 ++ addons/web_editor/static/src/scss/web_editor.backend.scss | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/legacy/js/views/basic/basic_renderer.js b/addons/web/static/src/legacy/js/views/basic/basic_renderer.js index 9ef280205bc..51609b063b6 100644 --- a/addons/web/static/src/legacy/js/views/basic/basic_renderer.js +++ b/addons/web/static/src/legacy/js/views/basic/basic_renderer.js @@ -447,6 +447,7 @@ var BasicRenderer = AbstractRenderer.extend(WidgetAdapterMixin, { */ _getTooltipOptions: function (widget) { return { + template: '', title: function () { let help = widget.attrs.help || widget.field.help || ''; if (session.display_switch_company_menu && widget.field.company_dependent) { diff --git a/addons/web/static/tests/helpers/cleanup.js b/addons/web/static/tests/helpers/cleanup.js index a13f16dedb2..32f8dddeeda 100644 --- a/addons/web/static/tests/helpers/cleanup.js +++ b/addons/web/static/tests/helpers/cleanup.js @@ -51,6 +51,8 @@ const validElements = [ { tagName: "DIV", attr: "class", value: "o_notification_manager" }, { tagName: "DIV", attr: "class", value: "tooltip fade bs-tooltip-auto" }, { tagName: "DIV", attr: "class", value: "tooltip fade bs-tooltip-auto show" }, + { tagName: "DIV", attr: "class", value: "tooltip tooltip-field-info fade bs-tooltip-auto" }, + { tagName: "DIV", attr: "class", value: "tooltip tooltip-field-info fade bs-tooltip-auto show" }, { tagName: "SPAN", attr: "class", value: "select2-hidden-accessible" }, // Due to a Document Kanban bug (already present in 12.0) diff --git a/addons/web_editor/static/src/scss/web_editor.backend.scss b/addons/web_editor/static/src/scss/web_editor.backend.scss index 1a8e94673fe..ceec29f2e5c 100644 --- a/addons/web_editor/static/src/scss/web_editor.backend.scss +++ b/addons/web_editor/static/src/scss/web_editor.backend.scss @@ -59,7 +59,7 @@ z-index: 1001 !important; border: 0; } - > :not(.modal):not(.modal-backdrop) { + .tooltip-field-info { display: none; } .o_form_fullscreen_ancestor {