Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of https://github.com/mde/model

  • Loading branch information...
commit ef08f436a0200d240712d45816b59eb1c969089e 2 parents 8a8e94a + e96b58c
@MiguelMadero MiguelMadero authored
Showing with 3 additions and 3 deletions.
  1. +1 −1  lib/datatypes.js
  2. +1 −1  lib/validators.js
  3. +1 −1  package.json
View
2  lib/datatypes.js
@@ -203,7 +203,7 @@ datatypes = {
, serialize: function (input, options) {
var val
, opts = options || {};
- if (typeof val.toString == 'function') {
+ if (typeof input.toString == 'function') {
val = input.toString();
}
else {
View
2  lib/validators.js
@@ -95,7 +95,7 @@ var validators = {
// If a specific length is wanted, there has to be a value
// in the first place
if (!val) {
- return i18n.getText('model.validatesPresent', {name: name}, locale);
+ return rule.message || i18n.getText('model.validatesPresent', {name: name}, locale);
}
// Validate that there's a qualifier to check against
View
2  package.json
@@ -14,7 +14,7 @@
"mongo",
"mongodb"
],
- "version": "0.0.36",
+ "version": "0.0.38",
"author": "Matthew Eernisse <mde@fleegix.org> (http://fleegix.org)",
"main": "./lib/index.js",
"scripts": {
Please sign in to comment.
Something went wrong with that request. Please try again.