diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-08-27 13:43:13 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-27 13:43:13 -0400 |
| commit | db7e8c12889485234fb2d1ba6556106e5fc7548b (patch) | |
| tree | 37bc43c5d7fbe3a09daba97f5b6465789c78fd03 /web/react/components | |
| parent | 0f06599763c5afbf2702674f162a34a771f2f5f8 (diff) | |
| parent | 38994fc50c44a046e64fddb10f619ad8ed06bf40 (diff) | |
| download | chat-db7e8c12889485234fb2d1ba6556106e5fc7548b.tar.gz chat-db7e8c12889485234fb2d1ba6556106e5fc7548b.tar.bz2 chat-db7e8c12889485234fb2d1ba6556106e5fc7548b.zip | |
Merge pull request #491 from mattermost/mm-1998
MM-1998 Temporary PM channels now use username instead of display name
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/sidebar.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index d79505e9e..8dd192893 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -64,7 +64,8 @@ function getStateFromStores() { var tempChannel = {}; tempChannel.fake = true; tempChannel.name = channelName; - tempChannel.display_name = utils.getDisplayName(teammate); + tempChannel.display_name = teammate.username; + tempChannel.teammate_username = teammate.username; tempChannel.status = UserStore.getStatus(teammate.id); tempChannel.last_post_at = 0; tempChannel.total_msg_count = 0; |