diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-07-20 12:18:40 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-07-20 12:18:40 -0400 |
commit | 4eb061d29cb6fdc35e4793c8d55ac593be1e8aef (patch) | |
tree | e4af38703cae683ca9afe3342a890a2cd78284c1 /web | |
parent | 6a229964c7c5214a7e61bfbdca1f1fe966ac2363 (diff) | |
parent | d0e4d71ac39bfdbe6d714c6693d3d803bfa811a2 (diff) | |
download | chat-4eb061d29cb6fdc35e4793c8d55ac593be1e8aef.tar.gz chat-4eb061d29cb6fdc35e4793c8d55ac593be1e8aef.tar.bz2 chat-4eb061d29cb6fdc35e4793c8d55ac593be1e8aef.zip |
Merge pull request #207 from hmhealey/mm825
MM-825 Fixed the labels on the mention list for users without their first/last name configured
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/mention_list.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx index 7e939812d..71a6083d2 100644 --- a/web/react/components/mention_list.jsx +++ b/web/react/components/mention_list.jsx @@ -7,6 +7,7 @@ var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); var Mention = require('./mention.jsx'); var Constants = require('../utils/constants.jsx'); +var Utils = require('../utils/utils.jsx'); var ActionTypes = Constants.ActionTypes; var MAX_HEIGHT_LIST = 292; @@ -194,7 +195,7 @@ module.exports = React.createClass({ <Mention ref={'mention' + index} username={users[i].username} - secondary_text={users[i].first_name + " " + users[i].last_name} + secondary_text={Utils.getFullName(users[i])} id={users[i].id} listId={index} isFocused={this.state.selectedMention === index ? "mentions-focus" : ""} |