summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_profile.jsx
diff options
context:
space:
mode:
authorReed Garmsen <rgarmsen2295@gmail.com>2015-11-23 17:14:13 -0800
committerReed Garmsen <rgarmsen2295@gmail.com>2015-12-01 08:21:58 -0800
commit478af4bf7501404ab53dd9afe981b26721682834 (patch)
treea0834c381d38f9035c99912397bfb8cc41a00226 /web/react/components/user_profile.jsx
parent62c96514bfa243029dba2d9b47b5b8a8322059e4 (diff)
downloadchat-478af4bf7501404ab53dd9afe981b26721682834.tar.gz
chat-478af4bf7501404ab53dd9afe981b26721682834.tar.bz2
chat-478af4bf7501404ab53dd9afe981b26721682834.zip
Enabled name display settings in more places
Diffstat (limited to 'web/react/components/user_profile.jsx')
-rw-r--r--web/react/components/user_profile.jsx6
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}