From cded791513816bc39bb137d9bd32eae68e4d42b5 Mon Sep 17 00:00:00 2001 From: David Lu Date: Tue, 28 Jun 2016 15:39:23 -0400 Subject: added email display for sysadmins or current user (#3436) --- webapp/components/user_profile.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'webapp/components') 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(