TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-24 19:33:02 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5720 from ErisDS/password-flow

Browse Source 
Don't clear password field until setup is complete
This commit is contained in:
Kevin Ansfield 2015-08-26 12:41:18 +01:00
commit b40350b760
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghost/admin/app/controllers/setup/three.js
View File

@ -123,7 +123,7 @@ export default Ember.Controller.extend({
notifications.showAlert(successCount + ' ' + invitationsString + ' sent!', {type: 'success', delayed: true});
self.send('loadServerNotifications');
self.transitionTo('posts.index');
self.transitionToRoute('posts.index');
}
self.toggleProperty('submitting');
@ -143,7 +143,7 @@ export default Ember.Controller.extend({
},
skipInvite: function () {
this.send('loadServerNotifications');
this.transitionTo('posts.index');
this.transitionToRoute('posts.index');
}
}
});

1
ghost/admin/app/controllers/setup/two.js
View File

@ -79,7 +79,6 @@ export default Ember.Controller.extend(ValidationEngine, {
identification: self.get('email'),
password: self.get('password')
}).then(function () {
self.set('password', '');
self.set('blogCreated', true);
if (data.image) {
self.sendImage(result.users[0])

4
ghost/admin/app/routes/setup.js
View File

@ -31,5 +31,9 @@ export default Ember.Route.extend(styleBody, {
return self.transitionTo('signin');
}
});
},
deactivate: function () {
this._super();
this.controllerFor('setup/two').set('password', '');
}
});