Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-30 11:33:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'bugfix/activity-fix-location-visibility' into issue279_accompanying_period_validation

Browse Source
This commit is contained in:
Julien Fastré
2021-12-07 17:57:02 +01:00
parent f6408af543 5b4388eae6
commit b1b9acc686
6 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Bundle/ChillActivityBundle/Form/ActivityType.php
View File

@@ -143,7 +143,7 @@ class ActivityType extends AbstractType
return array_map(
fn (string $id): ?SocialIssue => $this->om->getRepository(SocialIssue::class)->findOneBy(['id' => (int) $id]),
explode(',', (string) $socialIssuesAsString)
explode(',', $socialIssuesAsString)
);
}
));
@@ -169,7 +169,7 @@ class ActivityType extends AbstractType
return array_map(
fn (string $id): ?SocialAction => $this->om->getRepository(SocialAction::class)->findOneBy(['id' => (int) $id]),
explode(',', (string) $socialActionsAsString)
explode(',', $socialActionsAsString)
);
}
));

2
src/Bundle/ChillActivityBundle/Form/ActivityTypeType.php
View File

@@ -55,7 +55,7 @@ class ActivityTypeType extends AbstractType
]);
$fields = [
'persons', 'user', 'date', 'place', 'persons',
'persons', 'user', 'date', 'location', 'persons',
'thirdParties', 'durationTime', 'travelTime', 'attendee',
'reasons', 'comment', 'sentReceived', 'documents',
'emergency', 'socialIssues', 'socialActions', 'users',