Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-13 13:54:23 +00:00
Code Issues Actions Projects Releases Wiki Activity

cs: Third and last part.

Browse Source
This commit is contained in:
Pol Dellaiera 2021-11-23 14:45:31 +01:00
parent 3ea35682eb
commit a2c209a857
No known key found for this signature in database
GPG Key ID: D476DFE9C67467CA
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Bundle/ChillMainBundle/Form/Type/AppendScopeChoiceTypeTrait.php
View File

@ -121,16 +121,16 @@ trait AppendScopeChoiceTypeTrait
$form = $event->getForm(); $form = $event->getForm();
$form->add( $form->add(
$builder $builder
->create( ->create(
$name, $name,
ChoiceType::class, ChoiceType::class,
[ [
'choices' => array_combine(array_values($choices), array_keys($choices)), 'choices' => array_combine(array_values($choices), array_keys($choices)),
'auto_initialize' => false, 'auto_initialize' => false,
] ]
) )
->addModelTransformer($dataTransformer) ->addModelTransformer($dataTransformer)
->getForm() ->getForm()
); );
} }
); );

6
src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
View File

@ -294,9 +294,9 @@ class SingleTaskRepository extends EntityRepository
->add($qb->expr()->isNotNull('st.warningInterval')) ->add($qb->expr()->isNotNull('st.warningInterval'))
->add( ->add(
$qb->expr()->gt( $qb->expr()->gt(
$qb->expr()->diff('st.endDate', 'st.warningInterval'), $qb->expr()->diff('st.endDate', 'st.warningInterval'),
':now' ':now'
) )
) )
) )
->add($qb->expr()->isNull('st.endDate')) ->add($qb->expr()->isNull('st.endDate'))