summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-09-23 14:04:08 -0700
committerCorey Hulen <corey@hulen.com>2015-09-23 14:04:08 -0700
commitd792745f54463772472bec23b0caaae703eaddb3 (patch)
treed98c966e0f273c5a6052e3c154bd7d75d091aa27 /web/react/components/user_settings
parent0170cfe604e6cfb430be0b6181243ca85a9ab27b (diff)
parentccf2e6e4e74fc249a094c2c27de675644f1065cb (diff)
downloadchat-d792745f54463772472bec23b0caaae703eaddb3.tar.gz
chat-d792745f54463772472bec23b0caaae703eaddb3.tar.bz2
chat-d792745f54463772472bec23b0caaae703eaddb3.zip
Merge pull request #752 from mattermost/PLT-11-email
PLT-11 Cleaned up config file and added ability to makes changes from the admin console.
Diffstat (limited to 'web/react/components/user_settings')
-rw-r--r--web/react/components/user_settings/user_settings_general.jsx2
-rw-r--r--web/react/components/user_settings/user_settings_modal.jsx2
2 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx
index 5d9d9bfde..c1d4c4ab5 100644
--- a/web/react/components/user_settings/user_settings_general.jsx
+++ b/web/react/components/user_settings/user_settings_general.jsx
@@ -208,7 +208,7 @@ export default class UserSettingsGeneralTab extends React.Component {
}
setupInitialState(props) {
var user = props.user;
- var emailEnabled = !global.window.config.ByPassEmail;
+ var emailEnabled = global.window.config.SendEmailNotifications === 'true';
return {username: user.username, firstName: user.first_name, lastName: user.last_name, nickname: user.nickname,
email: user.email, picture: null, loadingPicture: false, emailEnabled: emailEnabled};
}
diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx
index 430a7ec7c..5113d2429 100644
--- a/web/react/components/user_settings/user_settings_modal.jsx
+++ b/web/react/components/user_settings/user_settings_modal.jsx
@@ -38,7 +38,7 @@ export default class UserSettingsModal extends React.Component {
if (global.window.config.EnableOAuthServiceProvider === 'true') {
tabs.push({name: 'developer', uiName: 'Developer', icon: 'glyphicon glyphicon-th'});
}
- if (global.window.config.AllowIncomingWebhooks === 'true') {
+ if (global.window.config.EnableIncomingWebhooks === 'true') {
tabs.push({name: 'integrations', uiName: 'Integrations', icon: 'glyphicon glyphicon-transfer'});
}