IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixing group code review issues

Browse Source
This commit is contained in:
=Corey Hulen
2015-10-22 10:17:25 -07:00
parent cbbee5cadb
commit ab18616725
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/user.go
View File

@@ -430,7 +430,7 @@ func Login(c *Context, w http.ResponseWriter, r *http.Request, user *model.User,
w.Header().Set(model.HEADER_TOKEN, session.Token)
tokens := GetMultiSessionCookie(r)
multiToken = ""
multiToken := ""
seen := make(map[string]string)
seen[session.TeamId] = session.TeamId
for _, token := range tokens {

3
api/web_team_hub.go
View File

@@ -96,7 +96,8 @@ func ShouldSendEvent(webCon *WebConn, msg *model.Message) bool {
}
} else {
// Don't share a user's view events with other users
if msg.Action == model.ACTION_CHANNEL_VIEWED {
// but you still need to share it with yourself
if webCon.UserId != msg.UserId && msg.Action == model.ACTION_CHANNEL_VIEWED {
return false
}

4
web/react/utils/client.jsx
View File

@@ -4,8 +4,8 @@ var BrowserStore = require('../stores/browser_store.jsx');
var TeamStore = require('../stores/team_store.jsx');
var ErrorStore = require('../stores/error_store.jsx');
export function track(category, action, label, prop, val) {
global.window.analytics.track(action, {category: category, label: label, property: prop, value: val});
export function track(category, action, label, property, value) {
global.window.analytics.track(action, {category, label, property, value});
}
export function trackPage() {