diff options
| author | David Lu <david.lu@hotmail.com> | 2016-06-28 15:39:23 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-28 15:39:23 -0400 |
| commit | cded791513816bc39bb137d9bd32eae68e4d42b5 (patch) | |
| tree | 055c59625e64066176dd5969ea9c8b829563cc9c | |
| parent | bbb10301e67ebfcf8d984a0ef6e8ca539f51446e (diff) | |
| download | chat-cded791513816bc39bb137d9bd32eae68e4d42b5.tar.gz chat-cded791513816bc39bb137d9bd32eae68e4d42b5.tar.bz2 chat-cded791513816bc39bb137d9bd32eae68e4d42b5.zip | |
added email display for sysadmins or current user (#3436)
| -rw-r--r-- | webapp/components/user_profile.jsx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webapp/components/user_profile.jsx b/webapp/components/user_profile.jsx index 6f5365ac1..9a6045be7 100644 --- a/webapp/components/user_profile.jsx +++ b/webapp/components/user_profile.jsx @@ -3,6 +3,7 @@ import * as Utils from 'utils/utils.jsx'; import Client from 'utils/web_client.jsx'; +import UserStore from 'stores/user_store.jsx'; import {Popover, OverlayTrigger} from 'react-bootstrap'; @@ -78,7 +79,7 @@ export default class UserProfile extends React.Component { /> ); - if (global.window.mm_config.ShowEmailAddress === 'true') { + if (global.window.mm_config.ShowEmailAddress === 'true' || UserStore.isSystemAdminForCurrentUser() || this.props.user === UserStore.getCurrentUser()) { dataContent.push( <div data-toggle='tooltip' |