Skip to content

Improved notEmpty validation and fixed required fields validation. #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lucasconstantino wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improved notEmpty validation and fixed required fields validation. #269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion lib/model-patch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@

var async = require('async');
var utils = require('prana').utils;
var validator = require('validator/lib/validators');

// Modify notEmpty validator method.
validator.notEmpty = function (data) {
if (typeof data === 'undefined' || data === null) return false;
if (typeof data === 'number' || typeof data === 'boolean') return true;
if (Object.prototype.toString.call(data) === '[object Function]')
if (typeof data.length !== 'undefined' && data.length === 0) return false;
if (typeof data === 'string' && data.match(/^[\s\t\r\n]*$/)) return false;
if (JSON.stringify(data) === '{}') return false;

return true;
};

var modelPatch = module.exports = {

Expand Down Expand Up @@ -171,7 +184,7 @@ var modelPatch = module.exports = {
var fieldFullName = (prefix ? prefix + ' - ' : '') + fieldSettings.title;

// If field is required check if a value was supplied for it.
if (fieldSettings.required && !(fieldName in item)) {
if (fieldSettings.required && !(fieldName in item && validator.notEmpty(item[fieldName]))) {
errors.push(fieldFullName + ' is required.');
return next(null, [fieldFullName + ' is required.']);
}
Expand Down