GIT-960 show error when you cannot create a team
Этот коммит содержится в:
@@ -248,7 +248,7 @@ func createTeam(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
func CreateTeam(c *Context, team *model.Team) *model.Team {
|
||||
if !utils.Cfg.EmailSettings.EnableSignUpWithEmail {
|
||||
c.Err = model.NewAppError("createTeam", "Team sign-up with email is disabled.", "")
|
||||
c.Err.StatusCode = http.StatusNotImplemented
|
||||
c.Err.StatusCode = http.StatusForbidden
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@ export default class EmailSignUpPage extends React.Component {
|
||||
}
|
||||
handleSubmit(e) {
|
||||
e.preventDefault();
|
||||
let team = {};
|
||||
let state = {serverError: ''};
|
||||
var team = {};
|
||||
var state = {serverError: ''};
|
||||
|
||||
team.email = React.findDOMNode(this.refs.email).value.trim().toLowerCase();
|
||||
if (!team.email || !Utils.isEmail(team.email)) {
|
||||
@@ -31,20 +31,25 @@ export default class EmailSignUpPage extends React.Component {
|
||||
}
|
||||
|
||||
Client.signupTeam(team.email,
|
||||
function success(data) {
|
||||
(data) => {
|
||||
if (data.follow_link) {
|
||||
window.location.href = data.follow_link;
|
||||
} else {
|
||||
window.location.href = `/signup_team_confirm/?email=${encodeURIComponent(team.email)}`;
|
||||
}
|
||||
},
|
||||
function fail(err) {
|
||||
(err) => {
|
||||
state.serverError = err.message;
|
||||
this.setState(state);
|
||||
}.bind(this)
|
||||
}
|
||||
);
|
||||
}
|
||||
render() {
|
||||
var serverError = null;
|
||||
if (this.state.serverError) {
|
||||
serverError = <div className='form-group has-error'><label className='control-label'>{this.state.serverError}</label></div>;
|
||||
}
|
||||
|
||||
return (
|
||||
<form
|
||||
role='form'
|
||||
@@ -65,8 +70,9 @@ export default class EmailSignUpPage extends React.Component {
|
||||
className='btn btn-md btn-primary'
|
||||
type='submit'
|
||||
>
|
||||
Sign up
|
||||
{'Sign up'}
|
||||
</button>
|
||||
{serverError}
|
||||
</div>
|
||||
<div className='form-group margin--extra-2x'>
|
||||
<span><a href='/find_team'>{`Find my team`}</a></span>
|
||||
|
||||
@@ -40,17 +40,17 @@ export default class SSOSignUpPage extends React.Component {
|
||||
|
||||
client.createTeamWithSSO(team,
|
||||
this.props.service,
|
||||
function success(data) {
|
||||
(data) => {
|
||||
if (data.follow_link) {
|
||||
window.location.href = data.follow_link;
|
||||
} else {
|
||||
window.location.href = '/' + team.name + '/channels/town-square';
|
||||
}
|
||||
},
|
||||
function fail(err) {
|
||||
(err) => {
|
||||
state.serverError = err.message;
|
||||
this.setState(state);
|
||||
}.bind(this)
|
||||
}
|
||||
);
|
||||
}
|
||||
nameChange() {
|
||||
@@ -85,7 +85,7 @@ export default class SSOSignUpPage extends React.Component {
|
||||
disabled={disabled}
|
||||
>
|
||||
<span className='icon'/>
|
||||
<span>Create team with GitLab Account</span>
|
||||
<span>{'Create team with GitLab Account'}</span>
|
||||
</a>
|
||||
);
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user