summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console/service_settings.jsx
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-03-31 12:15:35 -0400
committerChristopher Speller <crspeller@gmail.com>2016-03-31 12:15:35 -0400
commit8abd74b89222fb09a5bb3783037f27eeb86303fc (patch)
treeb06b8c207b64952e90556c998a3274a709a4228f /webapp/components/admin_console/service_settings.jsx
parent5feda3559106e9d1f156fe25761c1a8c7c21db26 (diff)
parent68bc42824a206c881e383deea3e6d7a8086862de (diff)
downloadchat-8abd74b89222fb09a5bb3783037f27eeb86303fc.tar.gz
chat-8abd74b89222fb09a5bb3783037f27eeb86303fc.tar.bz2
chat-8abd74b89222fb09a5bb3783037f27eeb86303fc.zip
Merge pull request #2588 from hmhealey/plt2490
PLT-2491/PLT-2492 Fixed saving changes in ServiceSettings when MFA isn't available
Diffstat (limited to 'webapp/components/admin_console/service_settings.jsx')
-rw-r--r--webapp/components/admin_console/service_settings.jsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/webapp/components/admin_console/service_settings.jsx b/webapp/components/admin_console/service_settings.jsx
index 41ea5ea34..c72c97326 100644
--- a/webapp/components/admin_console/service_settings.jsx
+++ b/webapp/components/admin_console/service_settings.jsx
@@ -84,10 +84,13 @@ class ServiceSettings extends React.Component {
config.ServiceSettings.EnableDeveloper = ReactDOM.findDOMNode(this.refs.EnableDeveloper).checked;
config.ServiceSettings.EnableSecurityFixAlert = ReactDOM.findDOMNode(this.refs.EnableSecurityFixAlert).checked;
config.ServiceSettings.EnableInsecureOutgoingConnections = ReactDOM.findDOMNode(this.refs.EnableInsecureOutgoingConnections).checked;
- config.ServiceSettings.EnableMultifactorAuthentication = ReactDOM.findDOMNode(this.refs.EnableMultifactorAuthentication).checked;
config.ServiceSettings.EnableCommands = ReactDOM.findDOMNode(this.refs.EnableCommands).checked;
config.ServiceSettings.EnableOnlyAdminIntegrations = ReactDOM.findDOMNode(this.refs.EnableOnlyAdminIntegrations).checked;
+ if (this.refs.EnablMultifactorAuthentication) {
+ config.ServiceSettings.EnableMultifactorAuthentication = ReactDOM.findDOMNode(this.refs.EnableMultifactorAuthentication).checked;
+ }
+
//config.ServiceSettings.EnableOAuthServiceProvider = ReactDOM.findDOMNode(this.refs.EnableOAuthServiceProvider).checked;
var MaximumLoginAttempts = DefaultMaximumLoginAttempts;