diff options
author | =Corey Hulen <corey@hulen.com> | 2015-09-24 12:12:27 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-09-24 12:12:27 -0700 |
commit | 8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360 (patch) | |
tree | b961f87c1bd9a2428eaee8b5ebd8c9fd1baf0fcc /web/react/components/admin_console/service_settings.jsx | |
parent | a374419ad5c5f35174ee6285b4eaa57ef82235bd (diff) | |
parent | caa157a3774ee86f0e7003ef4debc49bd88cb9f0 (diff) | |
download | chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.tar.gz chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.tar.bz2 chat-8ad9a88bda0b6dc3f24945efdbe8b3aa4dcc4360.zip |
Fixing merge
Diffstat (limited to 'web/react/components/admin_console/service_settings.jsx')
-rw-r--r-- | web/react/components/admin_console/service_settings.jsx | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/web/react/components/admin_console/service_settings.jsx b/web/react/components/admin_console/service_settings.jsx index 1bb1f053b..4b09fefc2 100644 --- a/web/react/components/admin_console/service_settings.jsx +++ b/web/react/components/admin_console/service_settings.jsx @@ -35,7 +35,7 @@ export default class ServiceSettings extends React.Component { config.ServiceSettings.SegmentDeveloperKey = React.findDOMNode(this.refs.SegmentDeveloperKey).value.trim(); config.ServiceSettings.GoogleDeveloperKey = React.findDOMNode(this.refs.GoogleDeveloperKey).value.trim(); - config.ServiceSettings.EnableOAuthServiceProvider = React.findDOMNode(this.refs.EnableOAuthServiceProvider).checked; + //config.ServiceSettings.EnableOAuthServiceProvider = React.findDOMNode(this.refs.EnableOAuthServiceProvider).checked; config.ServiceSettings.EnableIncomingWebhooks = React.findDOMNode(this.refs.EnableIncomingWebhooks).checked; config.ServiceSettings.EnableTesting = React.findDOMNode(this.refs.EnableTesting).checked; @@ -173,42 +173,9 @@ export default class ServiceSettings extends React.Component { <div className='form-group'> <label className='control-label col-sm-4' - htmlFor='EnableOAuthServiceProvider' - > - {'Enable OAuth Service Provider: '} - </label> - <div className='col-sm-8'> - <label className='radio-inline'> - <input - type='radio' - name='EnableOAuthServiceProvider' - value='true' - ref='EnableOAuthServiceProvider' - defaultChecked={this.props.config.ServiceSettings.EnableOAuthServiceProvider} - onChange={this.handleChange} - /> - {'true'} - </label> - <label className='radio-inline'> - <input - type='radio' - name='EnableOAuthServiceProvider' - value='false' - defaultChecked={!this.props.config.ServiceSettings.EnableOAuthServiceProvider} - onChange={this.handleChange} - /> - {'false'} - </label> - <p className='help-text'>{'When enabled Mattermost will act as an Oauth2 Provider. Changing this will require a server restart before taking effect.'}</p> - </div> - </div> - - <div className='form-group'> - <label - className='control-label col-sm-4' htmlFor='EnableIncomingWebhooks' > - {'EnableIncomingWebhooks: '} + {'Enable Incoming Webhooks: '} </label> <div className='col-sm-8'> <label className='radio-inline'> @@ -291,6 +258,39 @@ export default class ServiceSettings extends React.Component { } } +// <div className='form-group'> +// <label +// className='control-label col-sm-4' +// htmlFor='EnableOAuthServiceProvider' +// > +// {'Enable OAuth Service Provider: '} +// </label> +// <div className='col-sm-8'> +// <label className='radio-inline'> +// <input +// type='radio' +// name='EnableOAuthServiceProvider' +// value='true' +// ref='EnableOAuthServiceProvider' +// defaultChecked={this.props.config.ServiceSettings.EnableOAuthServiceProvider} +// onChange={this.handleChange} +// /> +// {'true'} +// </label> +// <label className='radio-inline'> +// <input +// type='radio' +// name='EnableOAuthServiceProvider' +// value='false' +// defaultChecked={!this.props.config.ServiceSettings.EnableOAuthServiceProvider} +// onChange={this.handleChange} +// /> +// {'false'} +// </label> +// <p className='help-text'>{'When enabled Mattermost will act as an Oauth2 Provider. Changing this will require a server restart before taking effect.'}</p> +// </div> +// </div> + ServiceSettings.propTypes = { config: React.PropTypes.object }; |