diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-10-27 08:49:38 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-10-27 08:49:38 -0400 |
commit | 3ca8a11a43142d3923c56c4a3a0e51d1e615d520 (patch) | |
tree | 31f24f617e5f41e68d2cd6b86e413f2f8206d82b /web/react/components | |
parent | e92af0daa2e03d3bed50e9e22121214895448583 (diff) | |
parent | ae3e600c7d68a9fdf877f171143f054be980f6e6 (diff) | |
download | chat-3ca8a11a43142d3923c56c4a3a0e51d1e615d520.tar.gz chat-3ca8a11a43142d3923c56c4a3a0e51d1e615d520.tar.bz2 chat-3ca8a11a43142d3923c56c4a3a0e51d1e615d520.zip |
Merge pull request #1197 from rgarmsen2295/plt-166
PLT-166 Fixed issue with missing help text for @all and @channel in mention list
Diffstat (limited to 'web/react/components')
-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} |