Merge branch 'master' of github.com:balderdashy/sails

sgress454 · sgress454 · commit dc05cb7abdff · 2014-06-30T12:59:15.000-05:00
diff --git a/lib/hooks/blueprints/actionUtil.js b/lib/hooks/blueprints/actionUtil.js
@@ -228,7 +228,7 @@ module.exports = {
     }
 
     // Prune params which aren't fit to be used as `values`
-    values = req.params.all();
+    var values = req.params.all();
 
     // Omit built-in runtime config (like query modifiers)
     values = _.omit(values, blacklist || []);
diff --git a/lib/hooks/blueprints/actions/populate.js b/lib/hooks/blueprints/actions/populate.js
@@ -51,7 +51,7 @@ module.exports = function expand(req, res) {
     .exec(function found(err, matchingRecord) {
       if (err) return res.serverError(err);
       if (!matchingRecord) return res.notFound('No record found with the specified id.');
-      if (!matchingRecord[relation]) return res.notFound(util.format('Specified record (%s) is missing relation `%s`', parentId, alias));
+      if (!matchingRecord[relation]) return res.notFound(util.format('Specified record (%s) is missing relation `%s`', parentPk, relation));
 
       // Subcribe to instance, if relevant
       // TODO: only subscribe to populated attribute- not the entire model
diff --git a/package.json b/package.json
@@ -44,7 +44,7 @@
     "node-uuid": "~1.4.0",
     "ejs-locals": "~1.0.2",
     "glob": "~3.2.9",
-    "i18n": "~0.4.1",
+    "i18n": "~0.5.0",
     "sails-generate": "~0.10.2",
     "sails-build-dictionary": "~0.10.1",
     "grunt-cli": "~0.1.11",
@@ -60,7 +60,7 @@
     "grunt-contrib-watch": "~0.5.3",
     "grunt-contrib-uglify": "~0.4.0",
     "grunt-contrib-cssmin": "~0.9.0",
-    "grunt-contrib-less": "~0.11.0",
+    "grunt-contrib-less": "0.11.1",
     "grunt-contrib-coffee": "~0.10.1",
     "grunt-sync": "~0.0.4",
     "express3-handlebars": "~0.5.0",

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ module.exports = {`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	// Prune params which aren't fit to be used as `values`
`231`		`- values = req.params.all();`
	`231`	`+ var values = req.params.all();`
`232`	`232`
`233`	`233`	`// Omit built-in runtime config (like query modifiers)`
`234`	`234`	`values = _.omit(values, blacklist \|\| []);`