TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-25 11:55:03 +03:00
Code Issues Projects Releases Wiki Activity

Cleanup from notifications refactor.

Browse Source 
Refs #3521
This commit is contained in:
Jason Williams 2014-08-06 00:11:52 +00:00
parent d74a9174d8
commit 3242c5b4a9
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/admin/controllers/modals/invite-new-user.js
View File

@ -44,7 +44,7 @@ var InviteNewUserController = Ember.Controller.extend({
if (newUser.get('status') === 'invited-pending') {
self.notifications.showWarn('Invitation email was not sent. Please try resending.');
} else {
self.notifications.showSuccess(notificationText, false);
self.notifications.showSuccess(notificationText);
}
}).catch(function (errors) {
newUser.deleteRecord();

2
ghost/admin/controllers/settings/users/user.js
View File

@ -94,7 +94,7 @@ var SettingsUserController = Ember.ObjectController.extend({
self.notifications.showWarn('Invitation email was not sent. Please try resending.');
} else {
self.get('model').set('status', result.users[0].status);
self.notifications.showSuccess(notificationText, false);
self.notifications.showSuccess(notificationText);
}
}).catch(function (error) {
self.notifications.showAPIError(error);

2
ghost/admin/routes/reset.js
View File

@ -5,7 +5,7 @@ var ResetRoute = Ember.Route.extend(styleBody, loadingIndicator, {
classNames: ['ghost-reset'],
beforeModel: function () {
if (this.get('session').isAuthenticated) {
this.notifications.showWarn('You can\'t reset your password while you\'re signed in.', true);
this.notifications.showWarn('You can\'t reset your password while you\'re signed in.', { delayed: true });
this.transitionTo(SimpleAuth.Configuration.routeAfterAuthentication);
}
},

2
ghost/admin/routes/signup.js
View File

@ -5,7 +5,7 @@ var SignupRoute = Ember.Route.extend(styleBody, loadingIndicator, {
classNames: ['ghost-signup'],
beforeModel: function () {
if (this.get('session').isAuthenticated) {
this.notifications.showWarn('You need to sign out to register as a new user.', true);
this.notifications.showWarn('You need to sign out to register as a new user.', { delayed: true });
this.transitionTo(SimpleAuth.Configuration.routeAfterAuthentication);
}
},