mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Merge pull request #836 from mattermost/fix-gitlab

Просмотр исходного кода 
Fixing gitlab settings in admin console
Этот коммит содержится в:
Christopher Speller
2015-09-28 15:28:42 -04:00
родитель 8b69852364 7110aa42d9
Коммит 8df3d8bd41
1 изменённых файлов: 20 добавлений и 20 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

40
web/react/components/admin_console/gitlab_settings.jsx
Просмотреть файл

@@ -12,7 +12,7 @@ export default class GitLabSettings extends React.Component {
this.handleSubmit = this.handleSubmit.bind(this); this.handleSubmit = this.handleSubmit.bind(this);
this.state = { this.state = {
Allow: this.props.config.GitLabSettings.Allow, Enable: this.props.config.GitLabSettings.Enable,
saveNeeded: false, saveNeeded: false,
serverError: null serverError: null
}; };
@@ -21,12 +21,12 @@ export default class GitLabSettings extends React.Component {
handleChange(action) { handleChange(action) {
var s = {saveNeeded: true, serverError: this.state.serverError}; var s = {saveNeeded: true, serverError: this.state.serverError};
if (action === 'AllowTrue') { if (action === 'EnableTrue') {
s.Allow = true; s.Enable = true;
} }
if (action === 'AllowFalse') { if (action === 'EnableFalse') {
s.Allow = false; s.Enable = false;
} }
this.setState(s); this.setState(s);
@@ -37,7 +37,7 @@ export default class GitLabSettings extends React.Component {
$('#save-button').button('loading'); $('#save-button').button('loading');
var config = this.props.config; var config = this.props.config;
config.GitLabSettings.Allow = React.findDOMNode(this.refs.Allow).checked; config.GitLabSettings.Enable = React.findDOMNode(this.refs.Enable).checked;
config.GitLabSettings.Secret = React.findDOMNode(this.refs.Secret).value.trim(); config.GitLabSettings.Secret = React.findDOMNode(this.refs.Secret).value.trim();
config.GitLabSettings.Id = React.findDOMNode(this.refs.Id).value.trim(); config.GitLabSettings.Id = React.findDOMNode(this.refs.Id).value.trim();
config.GitLabSettings.Scope = React.findDOMNode(this.refs.Scope).value.trim(); config.GitLabSettings.Scope = React.findDOMNode(this.refs.Scope).value.trim();
@@ -88,7 +88,7 @@ export default class GitLabSettings extends React.Component {
<div className='form-group'> <div className='form-group'>
<label <label
className='control-label col-sm-4' className='control-label col-sm-4'
htmlFor='Allow' htmlFor='Enable'
> >
{'Enable Sign Up With GitLab: '} {'Enable Sign Up With GitLab: '}
</label> </label>
@@ -96,21 +96,21 @@ export default class GitLabSettings extends React.Component {
<label className='radio-inline'> <label className='radio-inline'>
<input <input
type='radio' type='radio'
name='Allow' name='Enable'
value='true' value='true'
ref='Allow' ref='Enable'
defaultChecked={this.props.config.GitLabSettings.Allow} defaultChecked={this.props.config.GitLabSettings.Enable}
onChange={this.handleChange.bind(this, 'AllowTrue')} onChange={this.handleChange.bind(this, 'EnableTrue')}
/> />
{'true'} {'true'}
</label> </label>
<label className='radio-inline'> <label className='radio-inline'>
<input <input
type='radio' type='radio'
name='Allow' name='Enable'
value='false' value='false'
defaultChecked={!this.props.config.GitLabSettings.Allow} defaultChecked={!this.props.config.GitLabSettings.Enable}
onChange={this.handleChange.bind(this, 'AllowFalse')} onChange={this.handleChange.bind(this, 'EnableFalse')}
/> />
{'false'} {'false'}
</label> </label>
@@ -134,7 +134,7 @@ export default class GitLabSettings extends React.Component {
placeholder='Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"' placeholder='Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"'
defaultValue={this.props.config.GitLabSettings.Secret} defaultValue={this.props.config.GitLabSettings.Secret}
onChange={this.handleChange} onChange={this.handleChange}
disabled={!this.state.Allow} disabled={!this.state.Enable}
/> />
<p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab.'}</p> <p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab.'}</p>
</div> </div>
@@ -156,7 +156,7 @@ export default class GitLabSettings extends React.Component {
placeholder='Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"' placeholder='Ex "jcuS8PuvcpGhpgHhlcpT1Mx42pnqMxQY"'
defaultValue={this.props.config.GitLabSettings.Id} defaultValue={this.props.config.GitLabSettings.Id}
onChange={this.handleChange} onChange={this.handleChange}
disabled={!this.state.Allow} disabled={!this.state.Enable}
/> />
<p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab'}</p> <p className='help-text'>{'Obtain this value via the instructions above for logging into GitLab'}</p>
</div> </div>
@@ -178,7 +178,7 @@ export default class GitLabSettings extends React.Component {
placeholder='Not currently used by GitLab. Please leave blank' placeholder='Not currently used by GitLab. Please leave blank'
defaultValue={this.props.config.GitLabSettings.Scope} defaultValue={this.props.config.GitLabSettings.Scope}
onChange={this.handleChange} onChange={this.handleChange}
disabled={!this.state.Allow} disabled={!this.state.Enable}
/> />
<p className='help-text'>{'This field is not yet used by GitLab OAuth. Other OAuth providers may use this field to specify the scope of account data from OAuth provider that is sent to Mattermost.'}</p> <p className='help-text'>{'This field is not yet used by GitLab OAuth. Other OAuth providers may use this field to specify the scope of account data from OAuth provider that is sent to Mattermost.'}</p>
</div> </div>
@@ -200,7 +200,7 @@ export default class GitLabSettings extends React.Component {
placeholder='Ex ""' placeholder='Ex ""'
defaultValue={this.props.config.GitLabSettings.AuthEndpoint} defaultValue={this.props.config.GitLabSettings.AuthEndpoint}
onChange={this.handleChange} onChange={this.handleChange}
disabled={!this.state.Allow} disabled={!this.state.Enable}
/> />
<p className='help-text'>{'Enter <your-gitlab-url>/oauth/authorize (example http://localhost:3000/oauth/authorize).'}</p> <p className='help-text'>{'Enter <your-gitlab-url>/oauth/authorize (example http://localhost:3000/oauth/authorize).'}</p>
</div> </div>
@@ -222,7 +222,7 @@ export default class GitLabSettings extends React.Component {
placeholder='Ex ""' placeholder='Ex ""'
defaultValue={this.props.config.GitLabSettings.TokenEndpoint} defaultValue={this.props.config.GitLabSettings.TokenEndpoint}
onChange={this.handleChange} onChange={this.handleChange}
disabled={!this.state.Allow} disabled={!this.state.Enable}
/> />
<p className='help-text'>{'Enter <your-gitlab-url>/oauth/token.'}</p> <p className='help-text'>{'Enter <your-gitlab-url>/oauth/token.'}</p>
</div> </div>
@@ -244,7 +244,7 @@ export default class GitLabSettings extends React.Component {
placeholder='Ex ""' placeholder='Ex ""'
defaultValue={this.props.config.GitLabSettings.UserApiEndpoint} defaultValue={this.props.config.GitLabSettings.UserApiEndpoint}
onChange={this.handleChange} onChange={this.handleChange}
disabled={!this.state.Allow} disabled={!this.state.Enable}
/> />
<p className='help-text'>{'Enter <your-gitlab-url>/api/v3/user.'}</p> <p className='help-text'>{'Enter <your-gitlab-url>/api/v3/user.'}</p>
</div> </div>