From d49859e4748b1401cd7d56397d878d4d9964b6ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 27 May 2022 22:32:06 +0200
Subject: [PATCH] change order for title in stored object

---
 .../Form/StoredObjectType.php                    | 16 ++++++++--------
 .../Resources/views/Form/fields.html.twig        |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php b/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
index 4a61cbebc..aaf1e80da 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/StoredObjectType.php
@@ -41,6 +41,13 @@ class StoredObjectType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        if (true === $options['has_title']) {
+            $builder
+                ->add('title', TextType::class, [
+                    'label' => 'Title',
+                ]);
+        }
+
         $builder
             ->add('filename', AsyncUploaderType::class)
             ->add('type', HiddenType::class)
@@ -65,13 +72,6 @@ class StoredObjectType extends AbstractType
                 [$this, 'transformObject'],
                 [$this, 'reverseTransformObject']
             ));
-
-        if ($options['has_title']) {
-            $builder
-                ->add('title', TextType::class, [
-                    'label' => 'Title',
-                ]);
-        }
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -81,7 +81,7 @@ class StoredObjectType extends AbstractType
 
         $resolver
             ->setDefault('has_title', false)
-            ->addAllowedValues('has_title', [true, false]);
+            ->setAllowedTypes('has_title', ['bool']);
     }
 
     public function getBlockPrefix()
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/Form/fields.html.twig
index 42cfb6052..e971e2aa0 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/Form/fields.html.twig
@@ -1,4 +1,5 @@
 {% block stored_object_widget %}
+    {% if form.title is defined %} {{ form_row(form.title) }} {% endif %}
     <div
         data-stored-object="data-stored-object"
         data-label-preparing="{{ ('Preparing'|trans ~ '...')|escape('html_attr') }}"
@@ -18,6 +19,5 @@
         {{ form_widget(form.keyInfos, { 'attr': { 'data-stored-object-key': 1 } }) }}
         {{ form_widget(form.iv, { 'attr': { 'data-stored-object-iv': 1 } }) }}
         {{ form_widget(form.type, { 'attr': { 'data-async-file-type': 1 } }) }}
-        {% if form.title is defined %} {{ form_row(form.title) }} {% endif %}
     </div>
 {% endblock %}