Prevent SSO users from changing their email
Этот коммит содержится в:
@@ -451,44 +451,60 @@ export default class UserSettingsGeneralTab extends React.Component {
|
||||
}
|
||||
}
|
||||
|
||||
inputs.push(
|
||||
<div key='emailSetting'>
|
||||
<div className='form-group'>
|
||||
<label className='col-sm-5 control-label'>{'Primary Email'}</label>
|
||||
<div className='col-sm-7'>
|
||||
<input
|
||||
className='form-control'
|
||||
type='text'
|
||||
onChange={this.updateEmail}
|
||||
value={this.state.email}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
let submit = null;
|
||||
|
||||
inputs.push(
|
||||
<div key='confirmEmailSetting'>
|
||||
<div className='form-group'>
|
||||
<label className='col-sm-5 control-label'>{'Confirm Email'}</label>
|
||||
<div className='col-sm-7'>
|
||||
<input
|
||||
className='form-control'
|
||||
type='text'
|
||||
onChange={this.updateConfirmEmail}
|
||||
value={this.state.confirmEmail}
|
||||
/>
|
||||
if (this.props.user.auth_service === '') {
|
||||
inputs.push(
|
||||
<div key='emailSetting'>
|
||||
<div className='form-group'>
|
||||
<label className='col-sm-5 control-label'>{'Primary Email'}</label>
|
||||
<div className='col-sm-7'>
|
||||
<input
|
||||
className='form-control'
|
||||
type='text'
|
||||
onChange={this.updateEmail}
|
||||
value={this.state.email}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{helpText}
|
||||
</div>
|
||||
);
|
||||
);
|
||||
|
||||
inputs.push(
|
||||
<div key='confirmEmailSetting'>
|
||||
<div className='form-group'>
|
||||
<label className='col-sm-5 control-label'>{'Confirm Email'}</label>
|
||||
<div className='col-sm-7'>
|
||||
<input
|
||||
className='form-control'
|
||||
type='text'
|
||||
onChange={this.updateConfirmEmail}
|
||||
value={this.state.confirmEmail}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
{helpText}
|
||||
</div>
|
||||
);
|
||||
|
||||
submit = this.submitEmail;
|
||||
} else {
|
||||
inputs.push(
|
||||
<div
|
||||
key='oauthEmailInfo'
|
||||
className='form-group'
|
||||
>
|
||||
<div className='setting-list__hint'>{'Log in occurs through GitLab. Email cannot be updated.'}</div>
|
||||
{helpText}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
emailSection = (
|
||||
<SettingItemMax
|
||||
title='Email'
|
||||
inputs={inputs}
|
||||
submit={this.submitEmail}
|
||||
submit={submit}
|
||||
server_error={serverError}
|
||||
client_error={emailError}
|
||||
updateSection={function clearSection(e) {
|
||||
@@ -499,15 +515,19 @@ export default class UserSettingsGeneralTab extends React.Component {
|
||||
);
|
||||
} else {
|
||||
let describe = '';
|
||||
if (this.state.emailChangeInProgress) {
|
||||
const newEmail = UserStore.getCurrentUser().email;
|
||||
if (newEmail) {
|
||||
describe = 'New Address: ' + newEmail + '\nCheck your email to verify the above address.';
|
||||
if (this.props.user.auth_service === '') {
|
||||
if (this.state.emailChangeInProgress) {
|
||||
const newEmail = UserStore.getCurrentUser().email;
|
||||
if (newEmail) {
|
||||
describe = 'New Address: ' + newEmail + '\nCheck your email to verify the above address.';
|
||||
} else {
|
||||
describe = 'Check your email to verify your new address';
|
||||
}
|
||||
} else {
|
||||
describe = 'Check your email to verify your new address';
|
||||
describe = UserStore.getCurrentUser().email;
|
||||
}
|
||||
} else {
|
||||
describe = UserStore.getCurrentUser().email;
|
||||
describe = 'Log in done through GitLab';
|
||||
}
|
||||
|
||||
emailSection = (
|
||||
|
||||
Ссылка в новой задаче
Block a user