diff options
author | hmhealey <harrisonmhealey@gmail.com> | 2015-07-13 17:47:57 -0400 |
---|---|---|
committer | hmhealey <harrisonmhealey@gmail.com> | 2015-07-17 15:22:57 -0400 |
commit | 098cbcdc21effeebe7e57fbd912a785e85cbfc5d (patch) | |
tree | fca1c712fe315ed49058de974b21efdaa0dd5b9c /web/react/components/member_list_team.jsx | |
parent | abcb44089c421872de582584049ca4cc6b268f37 (diff) | |
download | chat-098cbcdc21effeebe7e57fbd912a785e85cbfc5d.tar.gz chat-098cbcdc21effeebe7e57fbd912a785e85cbfc5d.tar.bz2 chat-098cbcdc21effeebe7e57fbd912a785e85cbfc5d.zip |
Unify all locations where we determine a user's display named based off of their nickname/username into a helper function
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 8d69a36d3..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.nickname.trim() ? user.nickname : user.username}</span> - <span className="member-email">{user.nickname.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> |