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

Merge pull request #5634 from acburdine/onboard-fixes

Browse Source 
Fixes in setup/three
This commit is contained in:
Hannah Wolfe 2015-08-10 13:17:28 +01:00
commit 9d1a78055e
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,8 +3,12 @@ import DS from 'ember-data';
export default Ember.Controller.extend({
notifications: Ember.inject.service(),
two: Ember.inject.controller('setup/two'),
errors: DS.Errors.create(),
users: '',
ownerEmail: Ember.computed.alias('two.email'),
usersArray: Ember.computed('users', function () {
var users = this.get('users').split('\n').filter(function (email) {
return email.trim().length > 0;
@ -17,11 +21,12 @@ export default Ember.Controller.extend({
return validator.isEmail(user);
});
}),
validateUsers: Ember.computed('usersArray', function () {
var errors = [];
validateUsers: Ember.computed('usersArray', 'ownerEmail', function () {
var errors = [],
self = this;
this.get('usersArray').forEach(function (user) {
if (!validator.isEmail(user)) {
if (!validator.isEmail(user) || user === self.get('ownerEmail')) {
errors.push({
user: user,
error: 'email'
@ -115,6 +120,7 @@ export default Ember.Controller.extend({
invitationsString = successCount > 1 ? 'invitations' : 'invitation';
notifications.showAlert(successCount + ' ' + invitationsString + ' sent!', {type: 'success', delayed: true});
self.send('loadServerNotifications');
self.transitionTo('posts.index');
}
});
@ -130,7 +136,10 @@ export default Ember.Controller.extend({
}
});
}
},
skipInvite: function () {
this.send('loadServerNotifications');
this.transitionTo('posts.index');
}
}
});

4
core/client/app/templates/setup/three.hbs
View File

@ -14,6 +14,6 @@
<button {{action 'invite'}} class="btn btn-default btn-lg btn-block {{buttonClass}}">
{{buttonText}}
</button>
{{#link-to "posts" class="gh-flow-skip"}}
<button class="gh-flow-skip" {{action "skipInvite"}}>
I'll do this later, take me to my blog!
{{/link-to}}
</button>