mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-03 23:00:14 -05:00
Merge pull request #3706 from jaswilli/invite-fixup
Close invite user modal immediately after submit.
This commit is contained in:
commit
d6b62501c0
1 changed files with 6 additions and 7 deletions
|
@ -24,12 +24,18 @@ var InviteNewUserController = Ember.Controller.extend({
|
||||||
setRole: function (role) {
|
setRole: function (role) {
|
||||||
this.set('role', role);
|
this.set('role', role);
|
||||||
},
|
},
|
||||||
|
|
||||||
confirmAccept: function () {
|
confirmAccept: function () {
|
||||||
var email = this.get('email'),
|
var email = this.get('email'),
|
||||||
role = this.get('role'),
|
role = this.get('role'),
|
||||||
self = this,
|
self = this,
|
||||||
newUser;
|
newUser;
|
||||||
|
|
||||||
|
// reset the form and close the modal
|
||||||
|
self.set('email', '');
|
||||||
|
self.set('role', self.get('authorRole'));
|
||||||
|
self.send('closeModal');
|
||||||
|
|
||||||
newUser = self.store.createRecord('user', {
|
newUser = self.store.createRecord('user', {
|
||||||
email: email,
|
email: email,
|
||||||
status: 'invited',
|
status: 'invited',
|
||||||
|
@ -49,13 +55,6 @@ var InviteNewUserController = Ember.Controller.extend({
|
||||||
}).catch(function (errors) {
|
}).catch(function (errors) {
|
||||||
newUser.deleteRecord();
|
newUser.deleteRecord();
|
||||||
self.notifications.showErrors(errors);
|
self.notifications.showErrors(errors);
|
||||||
}).finally(function () {
|
|
||||||
//Reset
|
|
||||||
self.set('email', '');
|
|
||||||
self.set('role', self.get('authorRole'));
|
|
||||||
//Make sure the modal closes on confirm, no matter the
|
|
||||||
//method used to close it (enter in input vs Confirm click)
|
|
||||||
self.send('closeModal');
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue