tqt/Ghost
2
1
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2023-12-13 21:00:40 +01:00
Code Issues 1 Releases Wiki Activity

Merge pull request #3670 from felixrieseberg/iss3641

Browse source 
Validation fix for number of posts/page
This commit is contained in:
Hannah Wolfe 2014-08-15 18:27:14 +01:00
commit 260d9562e4
4 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/client/templates/settings/general.hbs
View file

@ -58,7 +58,7 @@
<div class="form-group">
<label for="postsPerPage">Posts per page</label>
{{input id="postsPerPage" name="general[postsPerPage]" type="number" value=postsPerPage}}
{{input id="postsPerPage" name="general[postsPerPage]" value=postsPerPage min="1" max="1000" type="number"}}
<p>How many posts should be displayed on each page</p>
</div>

14
core/client/validators/setting.js
View file

@ -15,15 +15,19 @@ var SettingValidator = Ember.Object.create({
}
if (!validator.isEmail(email) || !validator.isLength(email, 0, 254)) {
validationErrors.push({ message: 'Please supply a valid email address' });
validationErrors.push({ message: 'Supply a valid email address' });
}
if (!validator.isInt(postsPerPage) || postsPerPage > 1000) {
validationErrors.push({ message: 'Please use a number less than 1000' });
if (postsPerPage > 1000) {
validationErrors.push({ message: 'The maximum number of posts per page is 1000' });
}
if (!validator.isInt(postsPerPage) || postsPerPage < 0) {
validationErrors.push({ message: 'Please use a number greater than 0' });
if (postsPerPage < 1) {
validationErrors.push({ message: 'The minimum number of posts per page is 1' });
}
if (!validator.isInt(postsPerPage)) {
validationErrors.push({ message: 'Posts per page must be a number' });
}
return validationErrors;

2
core/server/data/default-settings.json
View file

@ -44,7 +44,7 @@
"validations": {
"isNull": false,
"isInt": true,
"isLength": [0, 1000]
"isLength": [1, 1000]
}
},
"forceI18n": {

6
core/test/functional/client/settings_test.js
View file

@ -143,7 +143,7 @@ CasperTest.begin('General settings validation is correct', 7, function suite(tes
});
casper.waitForSelectorTextChange('.notification-error', function onSuccess() {
test.assertSelectorHasText('.notification-error', 'use a number');
test.assertSelectorHasText('.notification-error', 'must be a number');
}, casper.failOnTimeout(test, 'postsPerPage error did not appear'), 2000);
casper.thenClick('.js-bb-notification .close');
@ -154,7 +154,7 @@ CasperTest.begin('General settings validation is correct', 7, function suite(tes
});
casper.waitForSelectorTextChange('.notification-error', function onSuccess() {
test.assertSelectorHasText('.notification-error', 'use a number less than 1000');
test.assertSelectorHasText('.notification-error', 'maximum number of posts per page is 1000');
}, casper.failOnTimeout(test, 'postsPerPage max error did not appear', 2000));
casper.thenClick('.js-bb-notification .close');
@ -165,7 +165,7 @@ CasperTest.begin('General settings validation is correct', 7, function suite(tes
});
casper.waitForSelectorTextChange('.notification-error', function onSuccess() {
test.assertSelectorHasText('.notification-error', 'use a number greater than 0');
test.assertSelectorHasText('.notification-error', 'minimum number of posts per page is 1');
}, casper.failOnTimeout(test, 'postsPerPage min error did not appear', 2000));
});