Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-13 22:41:32 -05:00
Code Issues 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 3a03f8fda9
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/client/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}); notifications.showAlert(successCount + ' ' + invitationsString + ' sent!', {type: 'success', delayed: true});
self.send('loadServerNotifications'); self.send('loadServerNotifications');
self.transitionTo('posts.index'); self.transitionToRoute('posts.index');
} }
self.toggleProperty('submitting'); self.toggleProperty('submitting');
@ -143,7 +143,7 @@ export default Ember.Controller.extend({
}, },
skipInvite: function () { skipInvite: function () {
this.send('loadServerNotifications'); this.send('loadServerNotifications');
this.transitionTo('posts.index'); this.transitionToRoute('posts.index');
} }
} }
}); });

1
core/client/app/controllers/setup/two.js
View file

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

4
core/client/app/routes/setup.js
View file

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