Merge pull request #4128 from kinesisptyltd/master

Fix calls to keyForRelationship in embedded records
emberjs · Feb 1, 2016 · 8f6160c · 8f6160c
2 parents 5990a73 + e9c347a
commit 8f6160c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/addon/-private/serializers/embedded-records-mixin.js b/addon/-private/serializers/embedded-records-mixin.js
@@ -217,7 +217,7 @@ export default Ember.Mixin.create({
 
   _serializeEmbeddedBelongsTo(snapshot, json, relationship) {
     let embeddedSnapshot = snapshot.belongsTo(relationship.key);
-    let serializedKey = this.keyForRelationship(relationship.key, 'serialize');
+    let serializedKey = this.keyForRelationship(relationship.key, relationship.kind, 'serialize');
     if (!embeddedSnapshot) {
       json[serializedKey] = null;
     } else {
@@ -332,7 +332,7 @@ export default Ember.Mixin.create({
   },
 
   _serializeEmbeddedHasMany(snapshot, json, relationship) {
-    let serializedKey = this.keyForRelationship(relationship.key, 'serialize');
+    let serializedKey = this.keyForRelationship(relationship.key, relationship.kind, 'serialize');
 
     warn(
       `The embedded relationship '${serializedKey}' is undefined for '${snapshot.modelName}' with id '${snapshot.id}'. Please include it in your original payload.`,