Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-03 23:00:14 -05:00
Code Issues Activity

Merge pull request #5548 from acburdine/inline-errors-fix

Browse source 
Fix some validation bugs
This commit is contained in:
Hannah Wolfe 2015-07-12 10:44:27 +01:00
commit d57c0d43e2
3 changed files with 16 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/client/app/mixins/validation-engine.js
View file

@ -125,17 +125,15 @@ export default Ember.Mixin.create({
return reject(['The validator specified, "' + type + '", did not exist!']); return reject(['The validator specified, "' + type + '", did not exist!']);
} }
if (opts.property) {
model.get('errors').remove(opts.property);
} else {
model.get('errors').clear();
}
passed = validator.check(model, opts.property); passed = validator.check(model, opts.property);
if (passed) { return (passed) ? resolve() : reject();
if (opts.property) {
model.get('errors').remove(opts.property);
} else {
model.get('errors').clear();
}
return resolve();
}
return reject();
}); });
}, },

8
core/client/app/validators/reset.js
View file

@ -5,14 +5,12 @@ var ResetValidator = BaseValidator.create({
var p1 = model.get('newPassword'), var p1 = model.get('newPassword'),
p2 = model.get('ne2Password'); p2 = model.get('ne2Password');
if (!validator.equals(p1, p2)) {
model.get('errors').add('ne2Password', 'The two new passwords don\'t match.');
this.invalidate();
}
if (!validator.isLength(p1, 8)) { if (!validator.isLength(p1, 8)) {
model.get('errors').add('newPassword', 'The password is not long enough.'); model.get('errors').add('newPassword', 'The password is not long enough.');
this.invalidate(); this.invalidate();
} else if (!validator.equals(p1, p2)) {
model.get('errors').add('ne2Password', 'The two new passwords don\'t match.');
this.invalidate();
} }
} }
}); });

16
core/client/app/validators/setting.js
View file

@ -30,19 +30,15 @@ var SettingValidator = BaseValidator.create({
postsPerPage: function (model) { postsPerPage: function (model) {
var postsPerPage = model.get('postsPerPage'); var postsPerPage = model.get('postsPerPage');
if (postsPerPage > 1000) {
model.get('errors').add('postsPerPage', 'The maximum number of posts per page is 1000');
this.invalidate();
}
if (postsPerPage < 1) {
model.get('errors').add('postsPerPage', 'The minimum number of posts per page is 1');
this.invalidate();
}
if (!validator.isInt(postsPerPage)) { if (!validator.isInt(postsPerPage)) {
model.get('errors').add('postsPerPage', 'Posts per page must be a number'); model.get('errors').add('postsPerPage', 'Posts per page must be a number');
this.invalidate(); this.invalidate();
} else if (postsPerPage > 1000) {
model.get('errors').add('postsPerPage', 'The maximum number of posts per page is 1000');
this.invalidate();
} else if (postsPerPage < 1) {
model.get('errors').add('postsPerPage', 'The minimum number of posts per page is 1');
this.invalidate();
} }
} }
}); });