Fix second save nested layout agentejo#1485

Author: flommy

modules/Cockpit/assets/components/field-layout.tag

@@ -468,8 +468,17 @@
         remove(e) {
             this.items.splice(e.item.idx, 1);
 
+            function checkParent(child) {
+                if (!child.parent) {
+                    child.update();
+                } else {
+                    checkParent(child.parent);
+                }
+            }
+
             if (opts.child) {
                 this.parent.update()
+                checkParent(this);
             }
         }
 

modules/Collections/views/entry.php

@@ -336,7 +336,7 @@
 
                     App.ui.notify("Saving successful", "success");
 
-                    _.extend($this.entry, entry);
+                    _.extend(entry, $this.entry);
 
                     $this.fields.forEach(function(field){