summaryrefslogtreecommitdiffstats
path: root/web/react/components/sidebar.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-02 14:10:59 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-02 14:10:59 -0500
commit17233b1dce530eef75e16944da7abdb060d2c27e (patch)
tree76aaace305ed6fac3cb22ace8064229dbfa8ea04 /web/react/components/sidebar.jsx
parent16171468dd51bb60216b5b9fa26866ec0c38d81c (diff)
parentbc57489d8b9786ae15374b93e0691488972af0a6 (diff)
downloadchat-17233b1dce530eef75e16944da7abdb060d2c27e.tar.gz
chat-17233b1dce530eef75e16944da7abdb060d2c27e.tar.bz2
chat-17233b1dce530eef75e16944da7abdb060d2c27e.zip
Merge pull request #1259 from stasvovk/PLT-639
PLT-639: display full name, nickname or username in direct messages
Diffstat (limited to 'web/react/components/sidebar.jsx')
-rw-r--r--web/react/components/sidebar.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 5cb6d168b..a69fd48fc 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -136,7 +136,7 @@ export default class Sidebar extends React.Component {
channel.type = 'D';
}
- channel.display_name = teammate.username;
+ channel.display_name = Utils.displayUsername(teammate.id);
channel.teammate_id = teammate.id;
channel.status = UserStore.getStatus(teammate.id);