diff options
| author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-10-26 17:00:06 -0700 |
|---|---|---|
| committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-10-26 17:11:35 -0700 |
| commit | ae3e600c7d68a9fdf877f171143f054be980f6e6 (patch) | |
| tree | d8108031025db985ca59c6a822f6541245406fc1 /web | |
| parent | 1bb407721586169e7ca8f34f58edb44c51248a28 (diff) | |
| download | chat-ae3e600c7d68a9fdf877f171143f054be980f6e6.tar.gz chat-ae3e600c7d68a9fdf877f171143f054be980f6e6.tar.bz2 chat-ae3e600c7d68a9fdf877f171143f054be980f6e6.zip | |
Fixed issue with missing help text for @all and @channel in mention list
Diffstat (limited to 'web')
| -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} |