From f7957fb6aaddbcd7986a3d8a8eb2746d9569d0b9 Mon Sep 17 00:00:00 2001
From: XavierDo <xdo@odoo.com>
Date: Thu, 20 Sep 2018 11:47:02 +0200
Subject: [PATCH] [FIX] mail: prevent redirect to app switcher

Before this commit, trying to send or preview a mail from a kanban view was
redirecting to the appswitcher.
---
 addons/mail/static/src/js/activity.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/mail/static/src/js/activity.js b/addons/mail/static/src/js/activity.js
index 65a4f0a6f2e..b1f43e495c7 100644
--- a/addons/mail/static/src/js/activity.js
+++ b/addons/mail/static/src/js/activity.js
@@ -371,6 +371,8 @@ var BasicActivity = AbstractField.extend({
      */
     _onPreviewMailTemplate: function (ev) {
         ev.stopPropagation();
+        ev.preventDefault();
+        var self = this;
         var templateID = $(ev.currentTarget).data('template-id');
         var action = {
             name: _t('Compose Email'),
@@ -386,7 +388,9 @@ var BasicActivity = AbstractField.extend({
                 force_email: true,
             },
         };
-        return this.do_action(action, { on_close: function () {} });
+        return this.do_action(action, { on_close: function () {
+            self.trigger_up('reload');
+        } });
     },
     /**
      * @private
@@ -395,6 +399,7 @@ var BasicActivity = AbstractField.extend({
      */
     _onSendMailTemplate: function (ev) {
         ev.stopPropagation();
+        ev.preventDefault();
         var templateID = $(ev.currentTarget).data('template-id');
         return this._rpc({
                 model: this.model,