Merge branch 'master' of github.com:thelia/thelia

core/lib/Thelia/Form/AttributeAvCreationForm.php

@@ -28,7 +28,7 @@ use Symfony\Component\Validator\ExecutionContextInterface;
 use Symfony\Component\Validator\Constraints\NotBlank;
 use Thelia\Core\Translation\Translator;
 
-class AttributeValueCreationForm extends BaseForm
+class AttributeAvCreationForm extends BaseForm
 {
     protected function buildForm()
     {
@@ -57,6 +57,6 @@ class AttributeValueCreationForm extends BaseForm
 
     public function getName()
     {
-        return "thelia_attribute_value_creation";
+        return "thelia_attributeav_creation";
     }
 }

core/lib/Thelia/Form/AttributeModificationForm.php

@@ -43,6 +43,10 @@ class AttributeModificationForm extends AttributeCreationForm
                         )
                     )
             ))
+            ->add('attribute_values', 'collection', array(
+                    'type'   => 'text',
+                    'options'  => array('required'  => false)
+            ))
         ;
 
         // Add standard description fields