Merge branch 'viewPerson' of github.com:Champs-Libres/ChillPersonBundle into viewPerson

Conflicts:
	Form/PersonType.php
This commit is contained in:
Julien Fastré 2013-11-26 23:04:07 +01:00
commit af984962a7

View File

@ -20,9 +20,7 @@ class PersonType extends AbstractType
$builder $builder
->add('name') ->add('name')
->add('surname') ->add('surname')
->add('dateOfBirth', 'birthday', array( ->add('dateOfBirth', 'date', array('required' => false, 'widget' => 'single_text'))
'required' => false
))
->add('placeOfBirth', 'text', array('required' => false)) ->add('placeOfBirth', 'text', array('required' => false))
->add('genre', new GenderType(), array( ->add('genre', new GenderType(), array(
'required' => false 'required' => false