TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-13 14:39:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6307 from kevinansfield/fix-step3-endless-spinner

Browse Source 
Redirect after setup step 3 even if invite requests time out
This commit is contained in:
Hannah Wolfe 2016-01-11 18:10:27 +00:00
commit b748137a10
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/client/app/controllers/setup/three.js
View File

@ -1,7 +1,7 @@
import Ember from 'ember';
import DS from 'ember-data';
const {Controller, RSVP, computed, inject} = Ember;
const {Controller, RSVP, computed, inject, run} = Ember;
const {Errors} = DS;
const {alias} = computed;
const emberA = Ember.A;
@ -131,6 +131,13 @@ export default Controller.extend({
});
}),
_transitionAfterSubmission() {
if (!this._hasTransitioned) {
this._hasTransitioned = true;
this.transitionToRoute('posts.index');
}
},
actions: {
validate() {
this.validate();
@ -139,10 +146,17 @@ export default Controller.extend({
invite() {
let users = this.get('usersArray');
let notifications = this.get('notifications');
let invitationsString;
let invitationsString, submissionTimeout;
if (this.validate() && users.length > 0) {
this.toggleProperty('submitting');
this.set('submitting', true);
this._hasTransitioned = false;
// wait for 4 seconds, otherwise transition anyway
submissionTimeout = run.later(this, function () {
this._transitionAfterSubmission();
}, 4000);
this.get('authorRole').then((authorRole) => {
RSVP.Promise.all(
users.map((user) => {
@ -169,6 +183,8 @@ export default Controller.extend({
let successCount = 0;
let message;
run.cancel(submissionTimeout);
invites.forEach((invite) => {
if (invite.success) {
successCount++;
@ -181,6 +197,9 @@ export default Controller.extend({
invitationsString = erroredEmails.length > 1 ? ' invitations: ' : ' invitation: ';
message = `Failed to send ${erroredEmails.length} ${invitationsString}`;
message += erroredEmails.join(', ');
message += ". Please check your email configuration, see <a href=\'http://support.ghost.org/mail\' target=\'_blank\'>http://support.ghost.org/mail</a> for instructions";
message = Ember.String.htmlSafe(message);
notifications.showAlert(message, {type: 'error', delayed: successCount > 0, key: 'signup.send-invitations.failed'});
}
@ -189,9 +208,13 @@ export default Controller.extend({
invitationsString = successCount > 1 ? 'invitations' : 'invitation';
notifications.showAlert(`${successCount} ${invitationsString} sent!`, {type: 'success', delayed: true, key: 'signup.send-invitations.success'});
}
this.send('loadServerNotifications');
this.toggleProperty('submitting');
this.transitionToRoute('posts.index');
this.set('submitting', false);
run.schedule('actions', this, function () {
this.send('loadServerNotifications');
this._transitionAfterSubmission();
});
});
});
} else if (users.length === 0) {