summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorDavid Lu <david.lu@hotmail.com>2016-07-13 13:02:46 -0400
committerCorey Hulen <corey@hulen.com>2016-07-13 09:02:46 -0800
commit284ee12b2270d7ed86313be613b791d4a30ae46c (patch)
tree1717b73ce9d8e80be75e524489827a75e071abda /webapp
parent7c34ea9b8c148a674c7cdd8031c4915dd97462c6 (diff)
downloadchat-284ee12b2270d7ed86313be613b791d4a30ae46c.tar.gz
chat-284ee12b2270d7ed86313be613b791d4a30ae46c.tar.bz2
chat-284ee12b2270d7ed86313be613b791d4a30ae46c.zip
added username to system console users list (#3566)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/user_item.jsx7
1 files changed, 6 insertions, 1 deletions
diff --git a/webapp/components/admin_console/user_item.jsx b/webapp/components/admin_console/user_item.jsx
index e6c4f637c..79dbd5639 100644
--- a/webapp/components/admin_console/user_item.jsx
+++ b/webapp/components/admin_console/user_item.jsx
@@ -505,6 +505,11 @@ export default class UserItem extends React.Component {
);
}
+ let displayedName = Utils.getDisplayName(user);
+ if (displayedName !== user.username) {
+ displayedName += ' (@' + user.username + ')';
+ }
+
return (
<div className='more-modal__row'>
<img
@@ -514,7 +519,7 @@ export default class UserItem extends React.Component {
width='36'
/>
<div className='more-modal__details'>
- <div className='more-modal__name'>{Utils.getDisplayName(user)}</div>
+ <div className='more-modal__name'>{displayedName}</div>
<div className='more-modal__description'>
<FormattedHTMLMessage
id='admin.user_item.emailTitle'