fix(populate): clean up issues with #5124 that pop up when a conventi…

…onal populate is nested under a virtual populate like #8432
Automattic · Jun 16, 2020 · 5535fd3 · 5535fd3
1 parent 1f20d1c
commit 5535fd3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/helpers/populate/getModelsMapForPopulate.js b/lib/helpers/populate/getModelsMapForPopulate.js
@@ -294,7 +294,9 @@ function _virtualPopulate(model, docs, options, _virtualRes) {
     let justOne = null;
     if ('justOne' in options && options.justOne !== void 0) {
       justOne = options.justOne;
-    } else if (virtual.options.refPath) {
+    }
+
+    if (virtual.options.refPath) {
       const normalizedRefPath =
         normalizeRefPath(virtual.options.refPath, doc, options.path);
       justOne = !!virtual.options.justOne;

diff --git a/lib/model.js b/lib/model.js
@@ -4363,6 +4363,9 @@ function populate(model, docs, options, callback) {
   }
 
   if (!hasOne) {
+    if (modelsMap.length > 0) {
+      return callback();
+    }
     // If no models to populate but we have a nested populate,
     // keep trying, re: gh-8946
     if (options.populate != null) {