Code cleanup

cosmocode · Oct 21, 2020 · 10dfdbf · 10dfdbf
1 parent ac42bb3
commit 10dfdbf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/src/Actions/FormAction.php b/src/Actions/FormAction.php
@@ -66,7 +66,10 @@ protected function action(): Response
                     $this->request->getUploadedFiles()
                 );
                 $formValidator->validate();
-                $form->getMeta('saveButton') !== false && $form->persist();
+
+                if ($form->getMeta('saveButton') !== false) {
+                    $form->persist();
+                }
 
                 if ($form->isValid() && $form->getMode() === Form::MODE_SEND) {
                     $this->mailer->sendForm($form);

diff --git a/src/FormGenerator/Form.php b/src/FormGenerator/Form.php
@@ -157,12 +157,6 @@ public function getMode()
      */
     public function submit(array $data, array $files)
     {
-        // Important! Restore persisted data first to determine if UploadFormElements
-        // have already an uploaded file (They have a value which contains the file
-        // name)
-        // FIXME is this still necessary?
-        $this->restore();
-
         // submit data
         foreach ($this->formElements as $formElement) {
             $this->submitFormElement($formElement, $data, $files);
@@ -439,8 +433,11 @@ protected function setDefaultValues(AbstractFormElement $formElement)
                 $this->setDefaultValues($fieldsetChild);
             }
         } elseif ($formElement instanceof ChecklistFormElement
-            || $formElement instanceof  DropdownFormElement) {
-            $formElement->setDefaultValue();
+            || $formElement instanceof  DropdownFormElement
+        ) {
+            if (! $formElement->hasValue()) {
+                $formElement->setDefaultValue();
+            }
         }
     }
 

diff --git a/src/FormGenerator/FormElements/ChecklistFormElement.php b/src/FormGenerator/FormElements/ChecklistFormElement.php
@@ -18,10 +18,6 @@ class ChecklistFormElement extends AbstractDynamicFormElement
     public function setDefaultValue()
     {
 
-        if ($this->getValue()) {
-            return;
-        }
-
         $defaultValue = $this->getConfigValue('default');
 
         if ($defaultValue) {

diff --git a/src/FormGenerator/FormElements/DropdownFormElement.php b/src/FormGenerator/FormElements/DropdownFormElement.php
@@ -13,7 +13,7 @@ class DropdownFormElement extends AbstractDynamicFormElement
      *
      * @return void
      */
-    public function setdefaultvalue()
+    public function setDefaultValue()
     {
         if ($this->getValue()) {
             return;