summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_profile.jsx
diff options
context:
space:
mode:
authorDavid Lu <david.lu97@outlook.com>2016-08-09 01:41:05 -0400
committerCorey Hulen <corey@hulen.com>2016-08-08 21:41:05 -0800
commitad2c3bdb1de4b1476bad866ccb1e9287e49845b9 (patch)
tree328e90d668be5f091279bf257635ff2464ef6189 /webapp/components/user_profile.jsx
parent415145d62fd5195fc03759b5b4ed42c255529d7b (diff)
downloadchat-ad2c3bdb1de4b1476bad866ccb1e9287e49845b9.tar.gz
chat-ad2c3bdb1de4b1476bad866ccb1e9287e49845b9.tar.bz2
chat-ad2c3bdb1de4b1476bad866ccb1e9287e49845b9.zip
Added @username and full name to user profile popover (#3765)
Diffstat (limited to 'webapp/components/user_profile.jsx')
-rw-r--r--webapp/components/user_profile.jsx20
1 files changed, 19 insertions, 1 deletions
diff --git a/webapp/components/user_profile.jsx b/webapp/components/user_profile.jsx
index c7020fed9..bc542165a 100644
--- a/webapp/components/user_profile.jsx
+++ b/webapp/components/user_profile.jsx
@@ -79,6 +79,24 @@ export default class UserProfile extends React.Component {
/>
);
+ let fullname = Utils.getFullName(this.props.user);
+ if (fullname) {
+ dataContent.push(
+ <div
+ data-toggle='tooltip'
+ title={fullname}
+ key='user-popover-fullname'
+ >
+
+ <p
+ className='text-nowrap'
+ >
+ {fullname}
+ </p>
+ </div>
+ );
+ }
+
if (global.window.mm_config.ShowEmailAddress === 'true' || UserStore.isSystemAdminForCurrentUser() || this.props.user === UserStore.getCurrentUser()) {
dataContent.push(
<div
@@ -103,7 +121,7 @@ export default class UserProfile extends React.Component {
rootClose={true}
overlay={
<Popover
- title={name}
+ title={'@' + this.props.user.username}
id='user-profile-popover'
>
{dataContent}