diff --git a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php index 3eba23b37..b70e7a55b 100644 --- a/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php +++ b/src/Bundle/ChillMainBundle/Form/WorkflowStepType.php @@ -215,7 +215,7 @@ class WorkflowStepType extends AbstractType } else { foreach ($transition->getTos() as $to) { $meta = $workflow->getMetadataStore()->getPlaceMetadata($to); - + if ( !array_key_exists('isFinal', $meta) || false === $meta['isFinal'] ) { @@ -224,7 +224,7 @@ class WorkflowStepType extends AbstractType } $destUsers = $form['future_dest_users']->getData(); $destEmails = $form['future_dest_emails']->getData(); - + if (!$toFinal && [] === $destUsers && [] === $destEmails) { $context ->buildViolation('workflow.You must add at least one dest user or email') diff --git a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php index ba7a2bbc8..5fbf4b9ee 100644 --- a/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php +++ b/src/Bundle/ChillPersonBundle/EventListener/AccompanyingPeriodWorkEventListener.php @@ -11,7 +11,6 @@ declare(strict_types=1); namespace Chill\PersonBundle\EventListener; -use Chill\MainBundle\Entity\User; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork; use Symfony\Component\Security\Core\Security; @@ -27,6 +26,7 @@ class AccompanyingPeriodWorkEventListener public function prePersistAccompanyingPeriodWork(AccompanyingPeriodWork $work): void { $referrer = $work->getAccompanyingPeriod()->getUser(); + if (null !== $referrer) { $work->addReferrer($referrer); }