Comparing version 0.7.4 to 0.7.5-0
@@ -24,4 +24,4 @@ exports.definition = function(modelName) { | ||
findAll: function(req, res) { | ||
// Normalize WHERE parameter | ||
var where = applyFilter(req.param("sails_filter"), req.param('where'), Model); | ||
var where = req.param('where'); | ||
@@ -33,3 +33,3 @@ // If WHERE is a string, try to interpret it as JSON | ||
// If other params are specified, assume they represent attributes to be searched on in the model | ||
// If WHERE has not been specified, but other params ARE specified build the WHERE option using them | ||
var params; | ||
@@ -42,3 +42,4 @@ | ||
// Remove undefined params | ||
// as well as limit, skip, and sort | ||
// (as well as limit, skip, and sort) | ||
// to build a proper where query | ||
params = sails.util.objReject(params, function (param, key) { | ||
@@ -60,2 +61,3 @@ return _.isUndefined(param) || | ||
}; | ||
console.log(options); | ||
@@ -76,2 +78,3 @@ // Respond to queries | ||
// Store a new model | ||
@@ -78,0 +81,0 @@ create: function(req, res) { |
@@ -26,3 +26,3 @@ { | ||
], | ||
"version": "0.7.4", | ||
"version": "0.7.5-0", | ||
"description": "API-driven framework for building realtime apps, using MVC conventions (based on Express and Socket.io)", | ||
@@ -55,3 +55,3 @@ "homepage": "http://sailsjs.com", | ||
"dependencies": { | ||
"waterline": "~0.1.6-0", | ||
"waterline": "~0.3.0", | ||
"express": "= 2.5.11", | ||
@@ -74,2 +74,8 @@ "socket.io": "= 0.9.6", | ||
}, | ||
"devDependencies": { | ||
"mocha": "*", | ||
"chai": "*", | ||
"coffee-script": "*", | ||
"request": "*" | ||
}, | ||
"repository": { | ||
@@ -76,0 +82,0 @@ "type": "git", |
@@ -57,3 +57,3 @@ ![image_devInTub@2x.png](http://i.imgur.com/Tj9Nk.png) | ||
exports = HelloController; | ||
module.exports = HelloController; | ||
``` | ||
@@ -60,0 +60,0 @@ |
174774
59
2447
4
+ Addedwaterline@0.3.0(transitive)
+ Addedwaterline-dirty@0.3.0(transitive)
+ Addedwaterline-mysql@0.3.0(transitive)
- Removedwaterline@0.1.6-0(transitive)
- Removedwaterline-dirty@0.2.3(transitive)
- Removedwaterline-mysql@0.2.2(transitive)
Updatedwaterline@~0.3.0