diff options
| author | Corey Hulen <corey@hulen.com> | 2015-07-17 14:01:01 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-07-17 14:01:01 -0800 |
| commit | b306ec84378b36372b5465c09233094314789bf2 (patch) | |
| tree | 1995d12ac34a4c6ba459884c84cb28b62d62b296 /web/react/components/member_list_team.jsx | |
| parent | 66c22d342fa42068382c9e80427ea953676357db (diff) | |
| parent | 1dba330146a10718a2fc9eac0ae7d6e1d6bc0d79 (diff) | |
| download | chat-b306ec84378b36372b5465c09233094314789bf2.tar.gz chat-b306ec84378b36372b5465c09233094314789bf2.tar.bz2 chat-b306ec84378b36372b5465c09233094314789bf2.zip | |
Merge pull request #177 from hmhealey/mm825
MM-825 Replace FullName field with separate FirstName and LastName fields and repurpose the existing FullName as Nickname
Diffstat (limited to 'web/react/components/member_list_team.jsx')
| -rw-r--r-- | web/react/components/member_list_team.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/member_list_team.jsx b/web/react/components/member_list_team.jsx index 89b5e49d5..6f1d83193 100644 --- a/web/react/components/member_list_team.jsx +++ b/web/react/components/member_list_team.jsx @@ -85,8 +85,8 @@ var MemberListTeamItem = React.createClass({ return ( <div className="row member-div"> <img className="post-profile-img pull-left" src={"/api/v1/users/" + user.id + "/image?time=" + timestamp} height="36" width="36" /> - <span className="member-name">{user.full_name.trim() ? user.full_name : user.username}</span> - <span className="member-email">{user.full_name.trim() ? user.username : email}</span> + <span className="member-name">{utils.getDisplayName(user)}</span> + <span className="member-email">{email}</span> <div className="dropdown member-drop"> <a href="#" className="dropdown-toggle theme" type="button" id="channel_header_dropdown" data-toggle="dropdown" aria-expanded="true"> <span>{currentRoles} </span> |