Merge pull request #4374 from dnachev/fix-embedded-records-serialize

Fix #4366: EmbeddedRecordsMixin embeds the record, not the snapshot
emberjs · May 10, 2016 · afeb5e0 · afeb5e0
2 parents 2001ee3 + 91454da
commit afeb5e0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/addon/serializers/embedded-records-mixin.js b/addon/serializers/embedded-records-mixin.js
@@ -226,7 +226,7 @@ export default Ember.Mixin.create({
     if (!embeddedSnapshot) {
       json[serializedKey] = null;
     } else {
-      json[serializedKey] = embeddedSnapshot.record.serialize({ includeId: true });
+      json[serializedKey] = embeddedSnapshot.serialize({ includeId: true });
       this.removeEmbeddedForeignKey(snapshot, embeddedSnapshot, relationship, json[serializedKey]);
 
       if (relationship.options.polymorphic) {
@@ -440,7 +440,7 @@ export default Ember.Mixin.create({
 
     for (let i = 0; i < manyArray.length; i++) {
       let embeddedSnapshot = manyArray[i];
-      let embeddedJson = embeddedSnapshot.record.serialize({ includeId: true });
+      let embeddedJson = embeddedSnapshot.serialize({ includeId: true });
       this.removeEmbeddedForeignKey(snapshot, embeddedSnapshot, relationship, embeddedJson);
       ret[i] = embeddedJson;
     }