diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2015-12-01 11:34:53 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2015-12-01 11:34:53 -0500 |
| commit | 2b2ee62a1df0504fff3f3e0e59966db1cd297531 (patch) | |
| tree | 03f9a86f5c679a643a6a064e75c4046fde972744 /web/react/components/user_profile.jsx | |
| parent | 272ed29a85b617bfe771917e1f5cbe27c740946f (diff) | |
| parent | 478af4bf7501404ab53dd9afe981b26721682834 (diff) | |
| download | chat-2b2ee62a1df0504fff3f3e0e59966db1cd297531.tar.gz chat-2b2ee62a1df0504fff3f3e0e59966db1cd297531.tar.bz2 chat-2b2ee62a1df0504fff3f3e0e59966db1cd297531.zip | |
Merge pull request #1512 from rgarmsen2295/plt-995b
PLT-995 Applies name display preference setting in more places
Diffstat (limited to 'web/react/components/user_profile.jsx')
| -rw-r--r-- | web/react/components/user_profile.jsx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx index 438c0bc82..ea104fedb 100644 --- a/web/react/components/user_profile.jsx +++ b/web/react/components/user_profile.jsx @@ -54,9 +54,11 @@ export default class UserProfile extends React.Component { } } render() { - var name = this.state.profile.username; + var name = Utils.displayUsername(this.state.profile.id); if (this.props.overwriteName) { name = this.props.overwriteName; + } else if (!name) { + name = '...'; } if (this.props.disablePopover) { @@ -107,7 +109,7 @@ export default class UserProfile extends React.Component { rootClose={true} overlay={ <Popover - title={this.state.profile.username} + title={name} id='user-profile-popover' > {dataContent} |