Merge pull request #124 from Kunstmaan/fix_add_new_pagepart

fix: when adding a new pagepart with invalid fields, the pageparts was moved outside the page region
Kunstmaan · Sep 4, 2014 · 58622b7 · 58622b7
2 parents bc0626e + 5da5029
commit 58622b7
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/PagePartAdmin/PagePartAdmin.php b/PagePartAdmin/PagePartAdmin.php
@@ -191,12 +191,28 @@ public function preBindRequest(Request $request)
         // Create the objects for the new pageparts
         $this->newPageParts = array();
         $newRefIds          = $request->get($this->context . '_new');
+
         if (is_array($newRefIds)) {
             foreach ($newRefIds as $newId) {
                 $type                       = $request->get($this->context . '_type_' . $newId);
                 $this->newPageParts[$newId] = new $type();
             }
         }
+
+        // Sort pageparts again
+        $sequences = $request->get($this->context . '_sequence');
+        if (!is_null($sequences)) {
+            $tempPageparts = $this->pageParts;
+            $this->pageParts = array();
+            foreach ($sequences as $sequence) {
+                if (array_key_exists($sequence, $this->newPageParts)) {
+                    $this->pageParts[$sequence] = $this->newPageParts[$sequence];
+                } else {
+                    $this->pageParts[$sequence] = $tempPageparts[$sequence];
+                }
+            }
+            unset($tempPageparts);
+        }
     }
 
     /**