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

Merge remote-tracking branch 'origin/features/activity-form--marc' into features/activity-form

Browse Source
This commit is contained in:
Mathieu Jaumotte
2021-06-04 11:58:33 +02:00
parent a323e84357 4a1ebc1c4c
commit 330234981c
8 changed files with 309 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Bundle/ChillActivityBundle/Controller/ActivityController.php
View File

@@ -50,7 +50,7 @@ class ActivityController extends AbstractController
protected AuthorizationHelper $authorizationHelper;
protected LoggerInterface $logger;
protected SerializerInterface $serializer;
public function __construct(
@@ -191,6 +191,7 @@ class ActivityController extends AbstractController
'center' => $entity->getCenter(),
'role' => new Role('CHILL_ACTIVITY_CREATE'),
'activityType' => $entity->getType(),
'accompanyingPeriod' => $accompanyingPeriod,
])->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
@@ -210,7 +211,7 @@ class ActivityController extends AbstractController
}
$activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
return $this->render($view, [
'person' => $person,
'accompanyingCourse' => $accompanyingPeriod,
@@ -299,6 +300,7 @@ class ActivityController extends AbstractController
'center' => $entity->getCenter(),
'role' => new Role('CHILL_ACTIVITY_UPDATE'),
'activityType' => $entity->getType(),
'accompanyingPeriod' => $accompanyingPeriod,
])->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
@@ -329,7 +331,7 @@ class ActivityController extends AbstractController
}
$activity_array = $this->serializer->normalize($entity, 'json', ['groups' => 'read']);
return $this->render($view, array(
'entity' => $entity,
'edit_form' => $form->createView(),