From 0be32ad4fdf843eb38e2ef21b361cd1b6bae2475 Mon Sep 17 00:00:00 2001 From: Xavier Dubuc Date: Thu, 24 Dec 2020 15:01:38 +0000 Subject: [PATCH] [FIX] mail: fix click event handling when renaming DM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit task-2414811 closes odoo/odoo#64473 X-original-commit: b850a4ee4ed6688d7d5d1f51e29015cd279495bb Signed-off-by: Sébastien Theys (seb) --- .../components/discuss_sidebar_item/discuss_sidebar_item.js | 4 ++++ .../mail/static/src/components/editable_text/editable_text.js | 3 +++ 2 files changed, 7 insertions(+) diff --git a/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js b/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js index 26499d0f179..e513914d2f9 100644 --- a/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js +++ b/addons/mail/static/src/components/discuss_sidebar_item/discuss_sidebar_item.js @@ -6,6 +6,7 @@ const components = { ThreadIcon: require('mail/static/src/components/thread_icon/thread_icon.js'), }; const useStore = require('mail/static/src/component_hooks/use_store/use_store.js'); +const { isEventHandled } = require('mail/static/src/utils/utils.js'); const Dialog = require('web.Dialog'); @@ -117,6 +118,9 @@ class DiscussSidebarItem extends Component { * @param {MouseEvent} ev */ _onClick(ev) { + if (isEventHandled(ev, 'EditableText.click')) { + return; + } this.thread.open(); } diff --git a/addons/mail/static/src/components/editable_text/editable_text.js b/addons/mail/static/src/components/editable_text/editable_text.js index 4a4b926741e..6e0b682fc53 100644 --- a/addons/mail/static/src/components/editable_text/editable_text.js +++ b/addons/mail/static/src/components/editable_text/editable_text.js @@ -1,6 +1,8 @@ odoo.define('mail/static/src/components/editable_text/editable_text.js', function (require) { 'use strict'; +const { markEventHandled } = require('mail/static/src/utils/utils.js'); + const { Component } = owl; class EditableText extends Component { @@ -31,6 +33,7 @@ class EditableText extends Component { * @param {MouseEvent} ev */ _onClick(ev) { + markEventHandled(ev, 'EditableText.click'); this.trigger('o-clicked'); }