diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-27 20:15:33 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-27 20:15:33 +0500 |
| commit | 179c4ea684af8d2a021cc6f0042bc4408f39b0bb (patch) | |
| tree | 7789805249e5c962f1175f301beb74272dee30c0 /web/react/components/mention_list.jsx | |
| parent | 68b02ffb9eeb7a414feae8ed89b4011ccecf96bc (diff) | |
| parent | 50eb3d9fe46d6364b6f12201edfe0a401be3ccdd (diff) | |
| download | chat-179c4ea684af8d2a021cc6f0042bc4408f39b0bb.tar.gz chat-179c4ea684af8d2a021cc6f0042bc4408f39b0bb.tar.bz2 chat-179c4ea684af8d2a021cc6f0042bc4408f39b0bb.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements
Diffstat (limited to 'web/react/components/mention_list.jsx')
| -rw-r--r-- | web/react/components/mention_list.jsx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx index 8c1da942d..60cae55d6 100644 --- a/web/react/components/mention_list.jsx +++ b/web/react/components/mention_list.jsx @@ -217,12 +217,17 @@ export default class MentionList extends React.Component { if (this.state.selectedMention === index) { isFocused = 'mentions-focus'; } + + if (!users[i].secondary_text) { + users[i].secondary_text = Utils.getFullName(users[i]); + } + mentions[index] = ( <Mention key={'mention_key_' + index} ref={'mention' + index} username={users[i].username} - secondary_text={Utils.getFullName(users[i])} + secondary_text={users[i].secondary_text} id={users[i].id} listId={index} isFocused={isFocused} |