Improved brand form declarations

core/lib/Thelia/Form/Brand/BrandCreationForm.php

@@ -25,11 +25,9 @@ use Thelia\Model\Lang;
  */
 class BrandCreationForm extends BaseForm
 {
-    protected function buildForm()
+    protected function doBuilForm($titleFieldHelpLabel)
     {
-        $this->formBuilder
+        $this->formBuilder->add(
-            // Brand title
-            ->add(
             'title',
             'text',
             [
@@ -38,17 +36,13 @@ class BrandCreationForm extends BaseForm
                 'label'       => Translator::getInstance()->trans('Brand name'),
                 'label_attr'  => [
                     'for'         => 'title',
-                        'help'        => Translator::getInstance()->trans(
+                    'help'        => $titleFieldHelpLabel
-                            'Enter here the brand name in the default language (%title%)',
-                            [ '%title%' => Lang::getDefaultLanguage()->getTitle()]
-                        ),
                 ],
                 'attr' => [
                     'placeholder' => Translator::getInstance()->trans('The brand name or title'),
                 ]
             ]
         )
-            // Current locale
         ->add(
             'locale',
             'hidden',
@@ -63,7 +57,7 @@ class BrandCreationForm extends BaseForm
             'checkbox',
             [
                 'constraints' => [ ],
-                    'required'    => true,
+                'required'    => false,
                 'label'       => Translator::getInstance()->trans('This brand is online'),
                 'label_attr' => [
                     'for' => 'visible_create'
@@ -72,6 +66,16 @@ class BrandCreationForm extends BaseForm
         );
     }
 
+    protected function buildForm()
+    {
+        $this->doBuilForm(
+            Translator::getInstance()->trans(
+                'Enter here the brand name in the default language (%title%)',
+                [ '%title%' => Lang::getDefaultLanguage()->getTitle()]
+            )
+        );
+    }
+
     public function getName()
     {
         return 'thelia_brand_creation';

core/lib/Thelia/Form/Brand/BrandModificationForm.php

@@ -28,10 +28,11 @@ class BrandModificationForm extends BrandCreationForm
 
     protected function buildForm()
     {
-        parent::buildForm();
+        $this->doBuilForm(
+            Translator::getInstance()->trans('The brand name or title')
+        );
 
-        $this->formBuilder
+        $this->formBuilder->add(
-            ->add(
             'id',
             'hidden',
             [
@@ -39,22 +40,6 @@ class BrandModificationForm extends BrandCreationForm
                 'required'    => true,
             ]
         )
-            // Brand title
-            ->add(
-                'title',
-                'text',
-                [
-                    'constraints' => [ new NotBlank() ],
-                    'required'    => true,
-                    'label'       => Translator::getInstance()->trans('Brand name'),
-                    'label_attr'  => [
-                        'for'         => 'title'
-                    ],
-                    'attr' => [
-                        'placeholder' => Translator::getInstance()->trans('The brand name or title')
-                    ]
-                ]
-            )
         ->add("logo_image_id", "integer", [
                 'constraints' => [ ],
                 'required'    => false,

templates/backOffice/default/brands.html

@@ -200,7 +200,7 @@
                     {* Switch edition to the current locale *}
                     <input type="hidden" name="edit_language_id" value="{$ID}" />
 
-                    {render_form_field field="locale" value=$LOCALE}
+                    {render_form_field form=$form field="locale" value=$LOCALE}
 
                     <div class="input-group">
                         <input type="text" {form_field_attributes form=$form field="title"}>