diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-31 12:15:35 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-31 12:15:35 -0400 |
| commit | 8abd74b89222fb09a5bb3783037f27eeb86303fc (patch) | |
| tree | b06b8c207b64952e90556c998a3274a709a4228f /webapp | |
| parent | 5feda3559106e9d1f156fe25761c1a8c7c21db26 (diff) | |
| parent | 68bc42824a206c881e383deea3e6d7a8086862de (diff) | |
| download | chat-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')
| -rw-r--r-- | webapp/components/admin_console/service_settings.jsx | 5 | ||||
| -rw-r--r-- | webapp/components/logged_in.jsx | 5 |
2 files changed, 8 insertions, 2 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; diff --git a/webapp/components/logged_in.jsx b/webapp/components/logged_in.jsx index f7a6be647..3b44f5940 100644 --- a/webapp/components/logged_in.jsx +++ b/webapp/components/logged_in.jsx @@ -266,7 +266,10 @@ LoggedIn.defaultProps = { }; LoggedIn.propTypes = { - children: React.PropTypes.arrayOf(React.PropTypes.element), + children: React.PropTypes.oneOfType([ + React.PropTypes.arrayOf(React.PropTypes.element), + React.PropTypes.element + ]), navbar: React.PropTypes.element, sidebar: React.PropTypes.element, center: React.PropTypes.element, |