Make mergeSchema control more robust when saving _kind and _kinds

Automattic · Feb 13, 2017 · fe74c65 · fe74c65
1 parent 6427e43
commit fe74c65
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -663,6 +663,18 @@ Model.prototype.$__version = function(where, delta) {
 
 Model.prototype.$__mergeControl = function(delta, isDelta) {
   if (this.schema.mergeControl !== undefined) {
+    delete delta['$unset']['_kind'];
+    delete delta['$unset']['_kinds'];
+    var empty = true;
+    for (var prop in delta['$unset']) {
+      if (delta['$unset'].hasOwnProperty(prop)) {
+        empty = false;
+        break;
+      }
+    }
+    if (empty)
+      delete delta['$unset'];
+
     if (isDelta === true)
       delta = delta['$set'];
     this.setValue('_kind', delta._kind = this.schema.mergeControl._kind);