Merge pull request #29 from bolt/feature/button-type

Add button type. Fix issue with date field in email
bolt · Nov 24, 2020 · c65f7a6 · c65f7a6
2 parents 29e7b0d + 6858e89
commit c65f7a6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/Factory/FieldOptions.php b/src/Factory/FieldOptions.php
@@ -16,7 +16,7 @@ public static function get(string $formName, array $field): array
 
         $options['constraints'] = FieldConstraints::get($formName, $options);
 
-        if ($field['type'] === 'submit') {
+        if ($field['type'] === 'submit' || $field['type'] === 'button') {
             unset($options['constraints']);
         }
 

diff --git a/src/Factory/FieldType.php b/src/Factory/FieldType.php
@@ -4,6 +4,7 @@
 
 namespace Bolt\BoltForms\Factory;
 
+use Symfony\Component\Form\Extension\Core\Type\ButtonType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\CountryType;
@@ -51,6 +52,9 @@ public static function get($field): string
             case 'country':
                 $type = CountryType::class;
                 break;
+            case 'button':
+                $type = ButtonType::class;
+                break;
             case 'text':
             default:
                 $type = TextType::class;

diff --git a/templates/email_blocks.html.twig b/templates/email_blocks.html.twig
@@ -55,6 +55,8 @@
                 <li>
                     {%- if field.type == 'file' %}
                         {{ block('file_field_value') }}
+                    {%- if field.type in ['date', 'datetime', 'dateinterval']%}
+                        {{ block('field_date') }}
                     {%- else %}
                         {{ block('field_value') }}
                     {%- endif %}