fixes #679: Removed CheckableType, ChoiceType, EntityType. Added Chec…

…kboxType, CheckboxesType, RadiosType, DatalistType

src/Kris/LaravelFormBuilder/Field.php

@@ -2,16 +2,16 @@
 
 namespace Kris\LaravelFormBuilder;
 
-
 class Field
 {
     // Simple fields
     const TEXT = 'text';
     const TEXTAREA = 'textarea';
     const SELECT = 'select';
-    const CHOICE = 'choice';
     const CHECKBOX = 'checkbox';
-    const RADIO = 'radio';
+    const CHECKBOXES = 'checkboxes';
+    const RADIOS = 'radios';
+    const DATALIST = 'datalist';
     const PASSWORD = 'password';
     const HIDDEN = 'hidden';
     const FILE = 'file';
@@ -31,7 +31,6 @@ class Field
     const TEL = 'tel';
     const NUMBER = 'number';
     const RANGE = 'range';
-    const ENTITY = 'entity';
     const FORM = 'form';
     //Buttons
     const BUTTON_SUBMIT = 'submit';

src/Kris/LaravelFormBuilder/Fields/CheckableType.php → src/Kris/LaravelFormBuilder/Fields/CheckboxType.php

@@ -2,7 +2,7 @@
 
 namespace  Kris\LaravelFormBuilder\Fields;
 
-class CheckableType extends FormField
+class CheckboxType extends FormField
 {
 
     const DEFAULT_VALUE = 1;
@@ -17,7 +17,7 @@ class CheckableType extends FormField
      */
     protected function getTemplate()
     {
-        return $this->type;
+        return 'checkbox';
     }
 
     /**

src/Kris/LaravelFormBuilder/Fields/CheckboxesType.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Kris\LaravelFormBuilder\Fields;
+
+use Illuminate\Database\Eloquent\Collection;
+
+class CheckboxesType extends RadiosType
+{
+    protected function getTemplate()
+    {
+        return 'checkboxes';
+    }
+
+    public function setValue($value)
+    {
+        if ($value instanceof Collection) {
+            $value = $value->modelKeys();
+        }
+
+        parent::setValue($value);
+    }
+}

src/Kris/LaravelFormBuilder/Fields/DatalistType.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Kris\LaravelFormBuilder\Fields;
+
+class DatalistType extends FormField {
+
+	protected function getTemplate() {
+		return 'datalist';
+	}
+
+	public function getAllAttributes() {
+		return [];
+	}
+
+}

src/Kris/LaravelFormBuilder/Fields/FormField.php

@@ -142,12 +142,7 @@ protected function setupValue()
         }
 
         if (($value === null || $value instanceof \Closure) && !$isChild) {
-            if ($this instanceof EntityType) {
-                $attributeName = $this->name;
-            } else {
-                $attributeName = $this->getOption('value_property', $this->name);
-            }
-
+            $attributeName = $this->getOption('value_property', $this->name);
             $this->setValue($this->getModelValueAttribute($this->parent->getModel(), $attributeName));
         } elseif (!$isChild) {
             $this->hasDefault = true;