fix(populate): handle embedded discriminator refPath with multiple …

…documents Fix #9153
Automattic · Jun 30, 2020 · c0d56e6 · c0d56e6
1 parent 11371a6
commit c0d56e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/lib/helpers/populate/getModelsMapForPopulate.js b/lib/helpers/populate/getModelsMapForPopulate.js
@@ -232,7 +232,8 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     if (isRefPath && normalizedRefPath != null) {
       const pieces = normalizedRefPath.split('.');
       let cur = '';
-      for (const piece of pieces) {
+      for (let j = 0; j < pieces.length; ++j) {
+        const piece = pieces[j];
         cur = cur + (cur.length === 0 ? '' : '.') + piece;
         const schematype = modelSchema.path(cur);
         if (schematype != null &&
@@ -256,7 +257,7 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
               ret = ret.map(v => v === docValue ? SkipPopulateValue(v) : v);
               continue;
             }
-            const modelName = utils.getValue(pieces.slice(i + 1).join('.'), subdoc);
+            const modelName = utils.getValue(pieces.slice(j + 1).join('.'), subdoc);
             modelNames.push(modelName);
           }
         }

diff --git a/test/model.populate.test.js b/test/model.populate.test.js
@@ -9533,7 +9533,7 @@ describe('model: populate:', function() {
 
     return co(function*() {
       const doc1 = yield Model.create({ title: 'doc1' });
-      const doc2 = yield Model.create({
+      yield Model.create({
         title: 'doc2',
         items: [{
           type: 'link',