fix(document): support calling populate() on nested document props

Fix #5703
Automattic · Nov 19, 2017 · 6535373 · 6535373
1 parent 07d8edb
commit 6535373
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/document.js b/lib/document.js
@@ -2481,7 +2481,15 @@ Document.prototype.populate = function populate() {
     var paths = utils.object.vals(pop);
     this.$__.populate = undefined;
     paths.__noPromise = true;
-    this.constructor.populate(this, paths, fn);
+    var topLevelModel = this.constructor;
+    if (this.$__isNested) {
+      topLevelModel = this.$__.scope.constructor;
+      var nestedPath = this.$__.nestedPath;
+      paths.forEach(function(populateOptions) {
+        populateOptions.path = nestedPath + '.' + populateOptions.path;
+      });
+    }
+    topLevelModel.populate(this, paths, fn);
   }
 
   return this;

diff --git a/lib/services/document/compile.js b/lib/services/document/compile.js
@@ -83,6 +83,7 @@ function defineKey(prop, subprops, prototype, prefix, keys, options) {
           if (!prefix) {
             nested.$__.scope = this;
           }
+          nested.$__.nestedPath = path;
 
           Object.defineProperty(nested, 'schema', {
             enumerable: false,