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

Merge pull request #5534 from Remchi/bug-invite-user

Browse Source 
Invited user can sign up successfully
This commit is contained in:
Hannah Wolfe 2015-07-13 22:10:16 +01:00
commit 5998f3133d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/client/app/controllers/signup.js
View File

@ -45,7 +45,9 @@ export default Ember.Controller.extend(ValidationEngine, {
}); });
}).catch(function (errors) { }).catch(function (errors) {
self.toggleProperty('submitting'); self.toggleProperty('submitting');
notifications.showErrors(errors); if (errors) {
notifications.showErrors(errors);
}
}); });
} }
} }

2
core/client/app/routes/signup.js
View File

@ -1,4 +1,5 @@
import Ember from 'ember'; import Ember from 'ember';
import DS from 'ember-data';
import {request as ajax} from 'ic-ajax'; import {request as ajax} from 'ic-ajax';
import Configuration from 'simple-auth/configuration'; import Configuration from 'simple-auth/configuration';
import styleBody from 'ghost/mixins/style-body'; import styleBody from 'ghost/mixins/style-body';
@ -35,6 +36,7 @@ export default Ember.Route.extend(styleBody, {
model.set('email', email); model.set('email', email);
model.set('token', params.token); model.set('token', params.token);
model.set('errors', DS.Errors.create());
return ajax({ return ajax({
url: self.get('ghostPaths.url').api('authentication', 'invitation'), url: self.get('ghostPaths.url').api('authentication', 'invitation'),