summaryrefslogtreecommitdiffstats
path: root/webapp/stores/notification_store.jsx
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-06-06 10:46:09 -0300
committerHarrison Healey <harrisonmhealey@gmail.com>2016-06-06 09:46:09 -0400
commit6cee1f87f2361f3c4b431190ae2df2b12a2157ef (patch)
tree8ca1e5798baf0aa6a046b37b59d7b50751342c60 /webapp/stores/notification_store.jsx
parent6ab893dcba2dc45f9dd34546b1a1b5d7604c1a7f (diff)
downloadchat-6cee1f87f2361f3c4b431190ae2df2b12a2157ef.tar.gz
chat-6cee1f87f2361f3c4b431190ae2df2b12a2157ef.tar.bz2
chat-6cee1f87f2361f3c4b431190ae2df2b12a2157ef.zip
PLT-2990 Clicking on a desktop notification from another team opens the team (#3253)
Diffstat (limited to 'webapp/stores/notification_store.jsx')
-rw-r--r--webapp/stores/notification_store.jsx9
1 files changed, 5 insertions, 4 deletions
diff --git a/webapp/stores/notification_store.jsx b/webapp/stores/notification_store.jsx
index 202b24432..5935b876b 100644
--- a/webapp/stores/notification_store.jsx
+++ b/webapp/stores/notification_store.jsx
@@ -32,6 +32,7 @@ class NotificationStoreClass extends EventEmitter {
if (msgProps.mentions) {
mentions = JSON.parse(msgProps.mentions);
}
+ const teamId = msgProps.team_id;
const channel = ChannelStore.get(post.channel_id);
const user = UserStore.getCurrentUser();
@@ -67,14 +68,14 @@ class NotificationStoreClass extends EventEmitter {
if (notifyText.length === 0) {
if (msgProps.image) {
- Utils.notifyMe(title, username + Utils.localizeMessage('channel_loader.uploadedImage', ' uploaded an image'), channel);
+ Utils.notifyMe(title, username + Utils.localizeMessage('channel_loader.uploadedImage', ' uploaded an image'), channel, teamId);
} else if (msgProps.otherFile) {
- Utils.notifyMe(title, username + Utils.localizeMessage('channel_loader.uploadedFile', ' uploaded a file'), channel);
+ Utils.notifyMe(title, username + Utils.localizeMessage('channel_loader.uploadedFile', ' uploaded a file'), channel, teamId);
} else {
- Utils.notifyMe(title, username + Utils.localizeMessage('channel_loader.something', ' did something new'), channel);
+ Utils.notifyMe(title, username + Utils.localizeMessage('channel_loader.something', ' did something new'), channel, teamId);
}
} else {
- Utils.notifyMe(title, username + Utils.localizeMessage('channel_loader.wrote', ' wrote: ') + notifyText, channel);
+ Utils.notifyMe(title, username + Utils.localizeMessage('channel_loader.wrote', ' wrote: ') + notifyText, channel, teamId);
}
if (!user.notify_props || user.notify_props.desktop_sound === 'true') {
Utils.ding();