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

Merge remote-tracking branch 'origin/master' into doc/authorizaton-documentation-update

Browse Source
This commit is contained in:
Julien Fastré
2021-11-22 10:30:05 +01:00
parent e7fcebc99e 1194aaecaf
commit 98760bc5e8
300 changed files with 9998 additions and 5391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
View File

@@ -1,5 +1,7 @@
<?php
declare(strict_types=1);
namespace Chill\TaskBundle\Controller;
use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
@@ -29,14 +31,8 @@ use Chill\PersonBundle\Entity\AccompanyingPeriod;
use Symfony\Contracts\Translation\TranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface as TranslationTranslatorInterface;
/**
* Class SingleTaskController
*
* @package Chill\TaskBundle\Controller
*/
final class SingleTaskController extends AbstractController
{
private EventDispatcherInterface $eventDispatcher;
private TimelineBuilder $timelineBuilder;
private LoggerInterface $logger;
@@ -320,15 +316,12 @@ final class SingleTaskController extends AbstractController
* name="chill_task_single_task_delete"
* )
*/
public function deleteAction(
Request $request,
$id
) {
public function deleteAction(Request $request, $id) {
$course = null;
$em = $this->getDoctrine()->getManager();
$task = $em->getRepository(SingleTask::class)->find($id);
if (!$task) {
if (null === $task) {
throw $this->createNotFoundException('Unable to find Task entity.');
}
@@ -403,19 +396,24 @@ final class SingleTaskController extends AbstractController
}
}
if($task->getContext() instanceof Person){
return $this->render('@ChillTask/SingleTask/Person/confirm_delete.html.twig', array(
'task' => $task,
'delete_form' => $form->createView()
));
} else {
return $this->render('@ChillTask/SingleTask/AccompanyingCourse/confirm_delete.html.twig', array(
'task' => $task,
'delete_form' => $form->createView(),
'accompanyingCourse' => $course
));
if ($task->getContext() instanceof Person) {
return $this->render(
'@ChillTask/SingleTask/Person/confirm_delete.html.twig',
[
'task' => $task,
'delete_form' => $form->createView(),
]
);
}
return $this->render(
'@ChillTask/SingleTask/AccompanyingCourse/confirm_delete.html.twig',
[
'task' => $task,
'delete_form' => $form->createView(),
'accompanyingCourse' => $course
]
);
}
/**