Merge pull request #78 from SilbinaryWolf/fix-editdataobject

fix(Validation): Fix bug where saving an existing DataObject via a Form causes validate() to have the error: "Invalid file ID sent."
unclecheese · May 30, 2017 · bd14e95 · bd14e95
2 parents c92f9f6 + a9b7370
commit bd14e95
Showing 1 changed file with 28 additions and 0 deletions.
diff --git a/code/FileAttachmentField.php b/code/FileAttachmentField.php
@@ -452,11 +452,39 @@ public function validate($validator) {
     }
 
     /**
+     * @param int|array $val
+     * @param array|DataObject $data
      * @return $this
      */
     public function setValue($val, $data = array()) {
+        if (!$val && $data && $data instanceof DataObject && $data->exists()) {
+            // NOTE: This stops validation errors from occuring when editing
+            //       an already saved DataObject.
+            $fieldName = $this->getName();
+            $ids = array();
+            if ($data->hasOneComponent($fieldName)) {
+                $id = $data->{$fieldName.'ID'};
+                if ($id) {
+                   $ids[] = $id; 
+                }
+            } else if ($data->hasManyComponent($fieldName) || $data->manyManyComponent($fieldName)) {
+                $files = $data->{$fieldName}();
+                if ($files) {
+                    foreach ($files as $file) {
+                        if (!$file->exists()) {
+                            continue;
+                        }
+                        $ids[] = $file->ID; 
+                    }
+                }
+            }
+            if ($ids) {
+                $this->addValidFileIDs($ids);
+            }
+        }
         if ($data && is_array($data) && isset($data[$this->getName()])) {
             // Prevent Form::loadDataFrom() from loading invalid File IDs
+            // that may have been passed.
             $isInvalid = false;
             $validIDs = $this->getValidFileIDs();
             // NOTE(Jake): If the $data[$name] is an array, its coming from 'loadDataFrom'