Fixes #163.

Author: jmdobry

CHANGELOG.md

@@ -10,6 +10,7 @@
 
 ###### Backwards compatible bug fixes
 - #156 - cached findAll pending query doesn't get removed sometimes
+- #163 - loadRelations shouldn't try to load a relation if the id for it is missing
 - #165 - DS.hasChanges() reports changes after loading relations
 
 ##### 1.0.0-rc.1 - 03 September 2014

dist/angular-data.js

@@ -2994,17 +2994,17 @@ function loadRelations(resourceName, instance, relations, options) {
         var params = {};
         params[def.foreignKey] = instance[definition.idAttribute];
 
-        if (def.type === 'hasMany') {
+        if (def.type === 'hasMany' && params[def.foreignKey]) {
           task = DS.findAll(relationName, params, options);
         } else if (def.type === 'hasOne') {
           if (def.localKey && instance[def.localKey]) {
             task = DS.find(relationName, instance[def.localKey], options);
-          } else if (def.foreignKey) {
+          } else if (def.foreignKey && params[def.foreignKey]) {
             task = DS.findAll(relationName, params, options).then(function (hasOnes) {
               return hasOnes.length ? hasOnes[0] : null;
             });
           }
-        } else {
+        } else if (instance[def.localKey]) {
           task = DS.find(relationName, instance[def.localKey], options);
         }
 

dist/angular-data.min.js

@@ -101,17 +101,17 @@ function loadRelations(resourceName, instance, relations, options) {
         var params = {};
         params[def.foreignKey] = instance[definition.idAttribute];
 
-        if (def.type === 'hasMany') {
+        if (def.type === 'hasMany' && params[def.foreignKey]) {
           task = DS.findAll(relationName, params, options);
         } else if (def.type === 'hasOne') {
           if (def.localKey && instance[def.localKey]) {
             task = DS.find(relationName, instance[def.localKey], options);
-          } else if (def.foreignKey) {
+          } else if (def.foreignKey && params[def.foreignKey]) {
             task = DS.findAll(relationName, params, options).then(function (hasOnes) {
               return hasOnes.length ? hasOnes[0] : null;
             });
           }
-        } else {
+        } else if (instance[def.localKey]) {
           task = DS.find(relationName, instance[def.localKey], options);
         }