OpenSourceArk/Ghost
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4986 from ErisDS/notification-fix

Browse Source 
More serverside notificaiton HTML fixes
This commit is contained in:
Matt Enlow 2015-03-03 14:13:04 -07:00
commit e3fc748e92
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/client/controllers/settings/navigation.js
View File

@ -100,11 +100,13 @@ NavigationController = Ember.Controller.extend({
blogUrl = this.get('config').blogUrl,
blogUrlRegex = new RegExp('^' + blogUrl + '(.*)', 'i'),
navItems = this.get('navigationItems'),
message = 'One of your navigation items has an empty label. ' +
'<br /> Please enter a new label or delete the item before saving.',
match;
// Don't save if there's a blank label.
if (navItems.find(function (item) { return !item.get('isComplete') && !item.get('last');})) {
self.notifications.showErrors(['One of your navigation items has an empty label.<br>Please enter a new label or delete the item before saving.']);
self.notifications.showErrors([message.htmlSafe()]);
return;
}

5
core/client/routes/application.js
View File

@ -55,6 +55,11 @@ ApplicationRoute = Ember.Route.extend(SimpleAuth.ApplicationRouteMixin, Shortcut
sessionAuthenticationFailed: function (error) {
if (error.errors) {
// These are server side errors, which can be marked as htmlSafe
error.errors.forEach(function (err) {
err.message = err.message.htmlSafe();
});
this.notifications.showErrors(error.errors);
} else {
// connection errors don't return proper status message, only req.body

2
core/server/models/user.js
View File

@ -644,7 +644,7 @@ User = ghostBookshelf.Model.extend({
if (!matched) {
return Promise.resolve(self.setWarning(user, {validate: false})).then(function (remaining) {
s = (remaining > 1) ? 's' : '';
return Promise.reject(new errors.UnauthorizedError('Your password is incorrect.<br>' +
return Promise.reject(new errors.UnauthorizedError('Your password is incorrect. <br />' +
remaining + ' attempt' + s + ' remaining!'));
// Use comma structure, not .catch, because we don't want to catch incorrect passwords