Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-22 15:43:51 +00:00
Code Issues Actions Projects Releases Wiki Activity

resolving conflict

Browse Source
This commit is contained in:
Marc Ducobu
2015-02-06 11:26:09 +01:00
parent 8d5d2189f1 9fadc5d9c5
commit 090f91e19a
16 changed files with 841 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Form/AccompanyingPeriodType.php
View File

@@ -19,8 +19,11 @@ class AccompanyingPeriodType extends AbstractType
//if the period_action is close, date opening should not be seen
if ($options['period_action'] !== 'close') {
$builder
->add('date_opening', 'date', array("required" => true,
'widget' => 'single_text'));
->add('date_opening', 'date', array(
"required" => true,
'widget' => 'single_text',
'format' => 'dd-MM-yyyy'
));
}
// the closingDate should be seen only if period_action = close
@@ -38,7 +41,7 @@ class AccompanyingPeriodType extends AbstractType
($options['period_action'] === 'update' AND !$accompanyingPeriod->isOpen())
) {
$form->add('date_closing', 'date', array('required' => true,
'widget' => 'single_text'));
'widget' => 'single_text', 'format' => 'dd-MM-yyyy'));
$form->add('closingMotive', 'closing_motive');
}
});

3
Form/PersonType.php
View File

@@ -74,7 +74,8 @@ class PersonType extends AbstractType
public function setDefaultOptions(OptionsResolverInterface $resolver)
{
$resolver->setDefaults(array(
'data_class' => 'Chill\PersonBundle\Entity\Person'
'data_class' => 'Chill\PersonBundle\Entity\Person',
'validation_groups' => array('general', 'creation')
));
$resolver->setRequired(array(