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

FIX add initial user as suggestion and fix error when there are no suggestions

Browse Source
This commit is contained in:
Julie Lenaerts 2023-03-15 10:14:25 +01:00
parent de4cb1585b
commit eaea702454
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
View File

@ -354,6 +354,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
public function getUsersInvolved(): array public function getUsersInvolved(): array
{ {
$usersInvolved = []; $usersInvolved = [];
$usersInvolved[spl_object_hash($this->getCreatedBy())] = $this->getCreatedBy();
foreach ($this->steps as $step) { foreach ($this->steps as $step) {
foreach ($step->getDestUser() as $u) { foreach ($step->getDestUser() as $u) {

1
src/Bundle/ChillMainBundle/Form/Type/PickUserDynamicType.php
View File

@ -50,6 +50,7 @@ class PickUserDynamicType extends AbstractType
$view->vars['multiple'] = $options['multiple']; $view->vars['multiple'] = $options['multiple'];
$view->vars['types'] = ['user']; $view->vars['types'] = ['user'];
$view->vars['uniqid'] = uniqid('pick_user_dyn'); $view->vars['uniqid'] = uniqid('pick_user_dyn');
$view->vars['suggested'] = [];
foreach ($options['suggested'] as $user) { foreach ($options['suggested'] as $user) {
$view->vars['suggested'][] = $this->normalizer->normalize($user, 'json', ['groups' => 'read']); $view->vars['suggested'][] = $this->normalizer->normalize($user, 'json', ['groups' => 'read']);

1
src/Bundle/ChillPersonBundle/Form/Type/PickPersonDynamicType.php
View File

@ -49,6 +49,7 @@ class PickPersonDynamicType extends AbstractType
$view->vars['multiple'] = $options['multiple']; $view->vars['multiple'] = $options['multiple'];
$view->vars['types'] = ['person']; $view->vars['types'] = ['person'];
$view->vars['uniqid'] = uniqid('pick_user_dyn'); $view->vars['uniqid'] = uniqid('pick_user_dyn');
$view->vars['suggested'] = [];
foreach ($options['suggested'] as $person) { foreach ($options['suggested'] as $person) {
$view->vars['suggested'][] = $this->normalizer->normalize($person, 'json', ['groups' => 'read']); $view->vars['suggested'][] = $this->normalizer->normalize($person, 'json', ['groups' => 'read']);

1
src/Bundle/ChillThirdPartyBundle/Form/Type/PickThirdpartyDynamicType.php
View File

@ -49,6 +49,7 @@ class PickThirdpartyDynamicType extends AbstractType
$view->vars['multiple'] = $options['multiple']; $view->vars['multiple'] = $options['multiple'];
$view->vars['types'] = ['thirdparty']; $view->vars['types'] = ['thirdparty'];
$view->vars['uniqid'] = uniqid('pick_user_dyn'); $view->vars['uniqid'] = uniqid('pick_user_dyn');
$view->vars['suggested'] = [];
foreach ($options['suggested'] as $tp) { foreach ($options['suggested'] as $tp) {
$view->vars['suggested'][] = $this->normalizer->normalize($tp, 'json', ['groups' => 'read']); $view->vars['suggested'][] = $this->normalizer->normalize($tp, 'json', ['groups' => 'read']);