PLT-3846 Fixed loading screen not disappearing upon joining team (#3779)
* fixed loading screen not disappearing upon joining team * Update signup_user_complete.jsx
Этот коммит содержится в:
@@ -69,12 +69,12 @@ export default class SignupUserComplete extends React.Component {
|
|||||||
if ((inviteId && inviteId.length > 0) || (hash && hash.length > 0)) {
|
if ((inviteId && inviteId.length > 0) || (hash && hash.length > 0)) {
|
||||||
// if we are already logged in then attempt to just join the team
|
// if we are already logged in then attempt to just join the team
|
||||||
if (UserStore.getCurrentUser()) {
|
if (UserStore.getCurrentUser()) {
|
||||||
loading = true;
|
|
||||||
Client.addUserToTeamFromInvite(
|
Client.addUserToTeamFromInvite(
|
||||||
data,
|
data,
|
||||||
hash,
|
hash,
|
||||||
inviteId,
|
inviteId,
|
||||||
(team) => {
|
(team) => {
|
||||||
|
loading = true;
|
||||||
GlobalActions.emitInitialLoad(
|
GlobalActions.emitInitialLoad(
|
||||||
() => {
|
() => {
|
||||||
browserHistory.push('/' + team.name);
|
browserHistory.push('/' + team.name);
|
||||||
@@ -111,14 +111,12 @@ export default class SignupUserComplete extends React.Component {
|
|||||||
serverError: null,
|
serverError: null,
|
||||||
teamDisplayName: inviteData.display_name,
|
teamDisplayName: inviteData.display_name,
|
||||||
teamName: inviteData.name,
|
teamName: inviteData.name,
|
||||||
teamId: inviteData.id,
|
teamId: inviteData.id
|
||||||
loading: false
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
() => {
|
() => {
|
||||||
this.setState({
|
this.setState({
|
||||||
noOpenServerError: true,
|
noOpenServerError: true,
|
||||||
loading: false,
|
|
||||||
serverError:
|
serverError:
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='signup_user_completed.invalid_invite'
|
id='signup_user_completed.invalid_invite'
|
||||||
@@ -128,6 +126,7 @@ export default class SignupUserComplete extends React.Component {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
loading = false;
|
||||||
data = '';
|
data = '';
|
||||||
hash = '';
|
hash = '';
|
||||||
}
|
}
|
||||||
@@ -145,8 +144,7 @@ export default class SignupUserComplete extends React.Component {
|
|||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
id='signup_user_completed.no_open_server'
|
id='signup_user_completed.no_open_server'
|
||||||
defaultMessage='This server does not allow open signups. Please speak with your Administrator to receive an invitation.'
|
defaultMessage='This server does not allow open signups. Please speak with your Administrator to receive an invitation.'
|
||||||
/>,
|
/>
|
||||||
loading: false
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user