Merge pull request #1 from umpirsky/taxonomies-validation

Added validation.
Sylius · Dec 15, 2012 · 3c21647 · 3c21647
2 parents b7ff073 + fd579fc
commit 3c21647
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/src/Sylius/Bundle/TaxonomiesBundle/Form/Type/SelectionType.php b/src/Sylius/Bundle/TaxonomiesBundle/Form/Type/SelectionType.php
@@ -13,7 +13,6 @@
 
 use Doctrine\Common\Persistence\ObjectRepository;
 use Sylius\Bundle\TaxonomiesBundle\Form\DataTransformer\SelectionToTaxonsTransformer;
-use Symfony\Bridge\Doctrine\Form\DataTransformer\CollectionToArrayTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\ChoiceList\ObjectChoiceList;
 use Symfony\Component\Form\FormBuilderInterface;

diff --git a/src/Sylius/Bundle/TaxonomiesBundle/Resources/config/validation.xml b/src/Sylius/Bundle/TaxonomiesBundle/Resources/config/validation.xml
@@ -17,8 +17,21 @@
                                         http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
 
     <class name="Sylius\Bundle\TaxonomiesBundle\Model\Taxonomy">
+        <property name="root">
+            <constraint name="Valid" />
+        </property>
     </class>
+
     <class name="Sylius\Bundle\TaxonomiesBundle\Model\Taxon">
+        <property name="name">
+            <constraint name="NotBlank">
+                <option name="message">sylius_taxonomies.taxon.name.not_blank</option>
+            </constraint>
+            <constraint name="MaxLength">
+                <option name="limit">255</option>
+                <option name="message">sylius_taxonomies.taxon.name.max_length</option>
+            </constraint>
+        </property>
     </class>
 
 </constraint-mapping>
diff --git a/src/Sylius/Bundle/TaxonomiesBundle/Resources/translations/validators.en.yml b/src/Sylius/Bundle/TaxonomiesBundle/Resources/translations/validators.en.yml
@@ -0,0 +1,8 @@
+# This file is part of the Sylius package.
+# (c) Paweł Jędrzejewski
+
+sylius_taxonomies:
+    taxon:
+        name:
+            not_blank: "Please enter taxon name"
+            max_length: "Taxon name must not be longer than 255 characters"