[FIX] mail: group mail failures of channels

Before this commit, mail failures were correctly grouped in the
systray messaging menu, except for mail failures coming from channels.

This commit fixes grouping for mail failures from channel.

2 files changed, 6 insertions, 6 deletions

diff --git a/addons/mail/static/src/js/models/mail_failure.js b/addons/mail/static/src/js/models/mail_failure.js
index fe6241ff032..390b195f8d9 100644
--- a/addons/mail/static/src/js/models/mail_failure.js
+++ b/addons/mail/static/src/js/models/mail_failure.js
@@ -88,12 +88,12 @@ var MailFailure = Class.extend(Mixins.EventDispatcherMixin, ServicesMixin, {
         return preview;
     },
     /**
-     * Tell whether the mail failure comes from a message in a document thread.
+     * Tell whether the mail failure comes from a message in a document.
      *
      * @returns {boolean}
      */
-    isLinkedToDocumentThread: function () {
-        return !!(this._documentModel !== 'mail.channel' && this._documentID);
+    isLinkedToDocument: function () {
+        return !!(this._documentModel && this._documentID);
     },
 });
 
diff --git a/addons/mail/static/src/js/services/mail_manager.js b/addons/mail/static/src/js/services/mail_manager.js
index 61b1caaee25..0ceeb809fde 100644
--- a/addons/mail/static/src/js/services/mail_manager.js
+++ b/addons/mail/static/src/js/services/mail_manager.js
@@ -686,7 +686,7 @@ var MailManager =  AbstractService.extend({
             var isSameDocument = true;
             var sameModelItem = _.find(items, function (item) {
                 if (
-                    item.failure.isLinkedToDocumentThread() &&
+                    item.failure.isLinkedToDocument() &&
                     (item.failure.getDocumentModel() === failure.getDocumentModel())
                 ) {
                     isSameDocument = item.failure.getDocumentID() === failure.getDocumentID();
@@ -695,7 +695,7 @@ var MailManager =  AbstractService.extend({
                 return false;
             });
 
-            if (failure.isLinkedToDocumentThread() && sameModelItem) {
+            if (failure.isLinkedToDocument() && sameModelItem) {
                 unreadCounter = sameModelItem.unreadCounter + 1;
                 isSameDocument = sameModelItem.isSameDocument && isSameDocument;
                 var index = _.findIndex(items, sameModelItem);
@@ -720,7 +720,7 @@ var MailManager =  AbstractService.extend({
             _.extend(preview, item.failure.getPreview(), {
                 unreadCounter: item.unreadCounter,
             });
-            if (!item.failure.isSameDocument) {
+            if (!item.isSameDocument) {
                 preview.documentID = undefined;
             }
             return preview;