verdnatura-mirror
/
loopback-datasource-juggler
mirror of https://github.com/loopbackio/loopback-datasource-juggler
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/2.1.1' into production

This commit is contained in:
Raymond Feng 2014-07-27 00:40:51 -07:00
parent 45ece18e69 08070aab76
commit f11ac18b55
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/relation-definition.js
View File

@ -467,6 +467,10 @@ HasMany.prototype.findById = function (fkId, cb) {
filter.where[idName] = fkId;
filter.where[fk] = modelInstance[pk];
if (filter.where[fk] === undefined) {
// Foreign key is undefined
return process.nextTick(cb);
}
this.definition.applyScope(modelInstance, filter);
modelTo.findOne(filter, function (err, inst) {
@ -919,6 +923,11 @@ BelongsTo.prototype.related = function (refresh, params) {
var query = {where: {}};
query.where[pk] = modelInstance[fk];
if (query.where[pk] === undefined) {
// Foreign key is undefined
return process.nextTick(cb);
}
this.definition.applyScope(modelInstance, query);
modelTo.findOne(query, function (err, inst) {

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "loopback-datasource-juggler",
"version": "2.1.0",
"version": "2.1.1",
"description": "LoopBack DataSoure Juggler",
"keywords": [
"StrongLoop",