Merge pull request #643 from rudiedirkx/boolable-fields

+default field values alter for checkbox fields

Author: rudiedirkx

src/Kris/LaravelFormBuilder/Fields/CheckableType.php

@@ -5,6 +5,8 @@
 class CheckableType extends FormField
 {
 
+    const DEFAULT_VALUE = 1;
+
     /**
      * @inheritdoc
      */
@@ -25,7 +27,7 @@ public function getDefaults()
     {
         return [
             'attr' => ['class' => null, 'id' => $this->getName()],
-            'value' => 1,
+            'value' => self::DEFAULT_VALUE,
             'checked' => null
         ];
     }

src/Kris/LaravelFormBuilder/FormHelper.php

@@ -9,6 +9,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Translation\Translator;
 use Kris\LaravelFormBuilder\Events\AfterCollectingFieldRules;
+use Kris\LaravelFormBuilder\Fields\CheckableType;
 use Kris\LaravelFormBuilder\Fields\FormField;
 use Kris\LaravelFormBuilder\Form;
 use Kris\LaravelFormBuilder\RulesParser;
@@ -336,6 +337,43 @@ public function mergeAttributes(array $fields)
         return $attributes;
     }
 
+    /**
+     * Get a form's checkbox fields' names.
+     *
+     * @param  Form  $form
+     * @return array
+     */
+    public function getBoolableFields(Form $form)
+    {
+        $fields = [];
+        foreach ($form->getFields() as $name => $field) {
+            if ($field instanceof CheckableType && $field->getOption('value') == CheckableType::DEFAULT_VALUE) {
+                $fields[] = $this->transformToDotSyntax($name);
+            }
+        }
+
+        return $fields;
+    }
+
+    /**
+     * Turn checkbox fields into bools.
+     *
+     * @param  Form  $form
+     * @param  array $values
+     * @return void
+     */
+    public function alterFieldValuesBools(Form $form, array &$values)
+    {
+        $fields = $this->getBoolableFields($form);
+
+        foreach ($fields as $name) {
+          $value = Arr::get($values, $name, -1);
+          if ($value !== -1) {
+            Arr::set($values, $name, (int) (bool) $value);
+          }
+        }
+    }
+
     /**
      * Alter a form's values recursively according to its fields.
      *
@@ -345,6 +383,8 @@ public function mergeAttributes(array $fields)
      */
     public function alterFieldValues(Form $form, array &$values)
     {
+        $this->alterFieldValuesBools($form, $values);
+
         // Alter the form's child forms recursively
         foreach ($form->getFields() as $name => $field) {
             if (method_exists($field, 'alterFieldValues')) {