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

Merge branch 'master' into fix-email

Browse Source
This commit is contained in:
=Corey Hulen
2016-02-01 08:44:50 -08:00
parent 1006e99859 1543be8a06
commit 2487d561cd
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/react/components/navbar.jsx
View File

@@ -392,10 +392,14 @@ export default class Navbar extends React.Component {
} else if (channel.type === 'D') {
isDirect = true;
if (this.state.users.length > 1) {
let p;
if (this.state.users[0].id === currentId) {
channelTitle = UserStore.getProfile(this.state.users[1].id).username;
p = UserStore.getProfile(this.state.users[1].id);
} else {
channelTitle = UserStore.getProfile(this.state.users[0].id).username;
p = UserStore.getProfile(this.state.users[0].id);
}
if (p != null) {
channelTitle = p.username;
}
}
}

5
web/react/components/sidebar.jsx
View File

@@ -185,7 +185,10 @@ export default class Sidebar extends React.Component {
let currentChannelName = channel.display_name;
if (channel.type === 'D') {
currentChannelName = Utils.getDirectTeammate(channel.id).username;
const teammate = Utils.getDirectTeammate(channel.id);
if (teammate != null) {
currentChannelName = teammate.username;
}
}
const unread = this.getTotalUnreadCount();