FIX Saving individual blocks now correctly uses CMS fields to populat…

…e element data
silverstripe · Oct 28, 2018 · c557c16 · c557c16
1 parent a3a5e62
commit c557c16
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 22 deletions.
diff --git a/src/Controllers/ElementalAreaController.php b/src/Controllers/ElementalAreaController.php
@@ -144,7 +144,8 @@ public function apiSaveForm(HTTPRequest $request)
 
         try {
             $updated = false;
-            $element->update($data);
+
+            $element->updateFromFormData($data);
             // Check if anything will actually be changed before writing
             if ($element->isChanged()) {
                 $element->write();
@@ -193,7 +194,7 @@ public function formAction(HTTPRequest $request)
      * @param int $elementID
      * @return array
      */
-    protected function removeNamespacesFromFields(array $data, $elementID)
+    public static function removeNamespacesFromFields(array $data, $elementID)
     {
         $output = [];
         $template = sprintf(EditFormFactory::FIELD_NAMESPACE_TEMPLATE, $elementID, '');

diff --git a/src/Forms/ElementalAreaField.php b/src/Forms/ElementalAreaField.php
@@ -241,27 +241,9 @@ public function saveInto(DataObjectInterface $dataObject)
                 continue;
             }
 
-            $fieldNamePrefix = sprintf(EditFormFactory::FIELD_NAMESPACE_TEMPLATE, $elementId, '');
-            $prefixLength = strlen($fieldNamePrefix);
-
-            $cmsFields = $element->getCMSFields();
-
-            foreach ($data as $field => $datum) {
-                // Check that the field starts with a valid name
-                if (strpos($field, $fieldNamePrefix) !== 0) {
-                    continue;
-                }
-
-                $field = $cmsFields->dataFieldByName(substr($field, $prefixLength));
-
-                if (!$field) {
-                    continue;
-                }
-
-                $field->setSubmittedValue($datum);
-                $field->saveInto($element);
-            }
+            $data = ElementalAreaController::removeNamespacesFromFields($data, $element->ID);
 
+            $element->updateFromFormData($data);
             $element->write();
         }
     }

diff --git a/src/Models/BaseElement.php b/src/Models/BaseElement.php
@@ -3,6 +3,7 @@
 namespace DNADesign\Elemental\Models;
 
 use DNADesign\Elemental\Controllers\ElementController;
+use DNADesign\Elemental\Forms\EditFormFactory;
 use DNADesign\Elemental\Forms\TextCheckboxGroupField;
 use DNADesign\Elemental\ORM\FieldType\DBObjectType;
 use Exception;
@@ -469,6 +470,27 @@ public function getRenderTemplates($suffix = '')
         return $templateFlat;
     }
 
+    /**
+     * Given form data (wit
+     *
+     * @param $data
+     */
+    public function updateFromFormData($data)
+    {
+        $cmsFields = $this->getCMSFields();
+
+        foreach ($data as $field => $datum) {
+            $field = $cmsFields->dataFieldByName($field);
+
+            if (!$field) {
+                continue;
+            }
+
+            $field->setSubmittedValue($datum);
+            $field->saveInto($this);
+        }
+    }
+
     /**
      * Strip all namespaces from class namespace.
      *