diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-10-28 08:55:17 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-10-28 08:55:17 -0400 |
| commit | 35ceedf968ce5c3e9f1b548e9d5fe9123c68bbe6 (patch) | |
| tree | 058eab059da91b49c4a805fe8f87ba08b74bbcc2 | |
| parent | 589329b5c5e486fa32b77fd0afb525d446ea1e6d (diff) | |
| download | chat-35ceedf968ce5c3e9f1b548e9d5fe9123c68bbe6.tar.gz chat-35ceedf968ce5c3e9f1b548e9d5fe9123c68bbe6.tar.bz2 chat-35ceedf968ce5c3e9f1b548e9d5fe9123c68bbe6.zip | |
Fix members being loaded before channel members and DM headers (#4369)
| -rw-r--r-- | store/sql_channel_store.go | 2 | ||||
| -rw-r--r-- | webapp/components/sidebar.jsx | 1 | ||||
| -rw-r--r-- | webapp/routes/route_team.jsx | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index f1cf7f849..d1d48ef69 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -1039,7 +1039,7 @@ func (s SqlChannelStore) GetMembersForUser(teamId string, userId string) StoreCh FROM ChannelMembers cm INNER JOIN Channels c ON c.Id = cm.ChannelId - AND c.TeamId = :TeamId + AND (c.TeamId = :TeamId OR c.TeamId = '') WHERE cm.UserId = :UserId `, map[string]interface{}{"TeamId": teamId, "UserId": userId}) diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx index 2a589b996..21df429f7 100644 --- a/webapp/components/sidebar.jsx +++ b/webapp/components/sidebar.jsx @@ -127,6 +127,7 @@ export default class Sidebar extends React.Component { document.addEventListener('keydown', this.navigateUnreadChannelShortcut); loadProfilesAndTeamMembersForDMSidebar(); + AsyncClient.getMyChannelMembers(); } shouldComponentUpdate(nextProps, nextState) { diff --git a/webapp/routes/route_team.jsx b/webapp/routes/route_team.jsx index 608052a58..5b6948ea2 100644 --- a/webapp/routes/route_team.jsx +++ b/webapp/routes/route_team.jsx @@ -78,8 +78,6 @@ function preNeedsTeam(nextState, replace, callback) { channels: data }); - AsyncClient.getMyChannelMembers(); - d1.resolve(); }, (err) => { |