Merge pull request #5667 from Parrryy/hasmany-polymorphic-extract

Added check to extract polymorphic relationship for hasMany (#5623)
emberjs · Oct 4, 2018 · 4d593aa · 4d593aa
2 parents 0929425 + 550052e
commit 4d593aa
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/addon/serializers/json.js b/addon/serializers/json.js
@@ -686,9 +686,20 @@ const JSONSerializer = Serializer.extend({
         } else if (relationshipMeta.kind === 'hasMany') {
           if (!isNone(relationshipHash)) {
             data = new Array(relationshipHash.length);
-            for (let i = 0, l = relationshipHash.length; i < l; i++) {
-              let item = relationshipHash[i];
-              data[i] = this.extractRelationship(relationshipMeta.type, item);
+            if (relationshipMeta.options.polymorphic) {
+              for (let i = 0, l = relationshipHash.length; i < l; i++) {
+                let item = relationshipHash[i];
+                data[i] = this.extractPolymorphicRelationship(relationshipMeta.type, item, {
+                  key,
+                  resourceHash,
+                  relationshipMeta,
+                });
+              }
+            } else {
+              for (let i = 0, l = relationshipHash.length; i < l; i++) {
+                let item = relationshipHash[i];
+                data[i] = this.extractRelationship(relationshipMeta.type, item);
+              }
             }
           }
         }