From 8411c909fffb9a57a017be64791afe4e8bffd04e Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Tue, 28 Sep 2021 11:53:19 +0200 Subject: [PATCH] notation modifications --- .../Controller/SingleTaskController.php | 21 ++++++++++--------- .../Resources/views/SingleTask/edit.html.twig | 3 ++- .../views/SingleTask/editCourseTask.html.twig | 3 ++- .../views/SingleTask/index.html.twig | 6 ++++-- .../Resources/views/SingleTask/new.html.twig | 3 ++- .../views/SingleTask/newCourseTask.html.twig | 3 ++- .../Resources/views/SingleTask/show.html.twig | 3 ++- .../views/SingleTask/showCourseTask.html.twig | 3 ++- 8 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php index 456699091..0af61e55c 100644 --- a/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php +++ b/src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php @@ -2,6 +2,7 @@ namespace Chill\TaskBundle\Controller; +use Chill\MainBundle\Entity\Scope; use Chill\PersonBundle\Privacy\PrivacyEvent; use Psr\Log\LoggerInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; @@ -281,12 +282,12 @@ class SingleTaskController extends AbstractController if($task->getContext() instanceof Person){ - return $this->render('ChillTaskBundle:SingleTask:show.html.twig', array( + return $this->render('@ChillTask/SingleTask/show.html.twig', array( 'task' => $task, 'timeline' => $timeline )); } else { - return $this->render('ChillTaskBundle:SingleTask:showCourseTask.html.twig', array( + return $this->render('@ChillTask/SingleTask/showCourseTask.html.twig', array( 'task' => $task, 'timeline' => $timeline )); @@ -401,12 +402,12 @@ class SingleTaskController extends AbstractController )); $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event); - return $this->render('ChillTaskBundle:SingleTask:edit.html.twig', array( + return $this->render('@ChillTask/SingleTask/edit.html.twig', array( 'task' => $task, 'form' => $form->createView() )); } else { - return $this->render('ChillTaskBundle:SingleTask:editCourseTask.html.twig', array( + return $this->render('@ChillTask/SingleTask/editCourseTask.html.twig', array( 'task' => $task, 'form' => $form->createView(), 'accompanyingCourse' => $course @@ -510,12 +511,12 @@ class SingleTaskController extends AbstractController } if($task->getContext() instanceof Person){ - return $this->render('ChillTaskBundle:SingleTask:confirm_delete.html.twig', array( + return $this->render('@ChillTask/SingleTask/confirm_delete.html.twig', array( 'task' => $task, 'delete_form' => $form->createView() )); } else { - return $this->render('ChillTaskBundle:SingleTask:confirm_deleteCourseTask.html.twig', array( + return $this->render('@ChillTask/SingleTask/confirm_deleteCourseTask.html.twig', array( 'task' => $task, 'delete_form' => $form->createView(), 'accompanyingCourse' => $course @@ -646,7 +647,7 @@ class SingleTaskController extends AbstractController $userId = $this->request->query->getInt('user_id', 0); $user = $this->getDoctrine()->getManager() - ->getRepository('ChillMainBundle:User') + ->getRepository(User::class) ->find($userId); if ($user === null) { @@ -663,7 +664,7 @@ class SingleTaskController extends AbstractController $scopeId = $this->request->query->getInt('scope_id', 0); $scope = $this->getDoctrine()->getManager() - ->getRepository('ChillMainBundle:Scope') + ->getRepository(Scope::class) ->find($scopeId); if ($scope === null) { @@ -762,7 +763,7 @@ class SingleTaskController extends AbstractController $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event); } - return $this->render('ChillTaskBundle:SingleTask:index.html.twig', + return $this->render('@ChillTask/SingleTask/index.html.twig', array_merge($viewParams, [ 'form' => $form->createView() ])); } @@ -859,7 +860,7 @@ class SingleTaskController extends AbstractController ]); return $this->render( - 'ChillTaskBundle:SingleTask:index.html.twig', + '@ChillTask/SingleTask/index.html.twig', [ 'tasks' => $tasks, 'accompanyingCourse' => $course, diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig index 590740cf0..6188bd859 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/edit.html.twig @@ -25,6 +25,7 @@ {% block personcontent %} - {% include 'ChillTaskBundle:SingleTask:_edit.html.twig' %} + {% include '@ChillTask/SingleTask/_edit.html.twig' %} + {% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/editCourseTask.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/editCourseTask.html.twig index 1805761ae..ccf0bab04 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/editCourseTask.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/editCourseTask.html.twig @@ -9,6 +9,7 @@ {% block content %} - {% include 'ChillTaskBundle:SingleTask:_edit.html.twig' %} + {% include '@ChillTask/SingleTask/_edit.html.twig' %} + {% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig index 4c0b9dc84..2f5819388 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig @@ -31,13 +31,15 @@ {% if person is not null %} {% block personcontent %}
- {% include 'ChillTaskBundle:SingleTask:_list.html.twig' %} + {% include '@ChillTask/SingleTask/_list.html.twig' %} +
{% endblock %} {% else %} {% block content %}
- {% include 'ChillTaskBundle:SingleTask:_listCourse.html.twig' %} + {% include '@ChillTask/SingleTask/_listCourse.html.twig' %} +
{% endblock %} {% endif %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig index 2b59fd5bf..226956aec 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig @@ -25,5 +25,6 @@ {% block personcontent %} - {% include 'ChillTaskBundle:SingleTask:_new.html.twig' %} + {% include '@ChillTask/SingleTask/_new.html.twig' %} + {% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/newCourseTask.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/newCourseTask.html.twig index 083c0795c..b8f810540 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/newCourseTask.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/newCourseTask.html.twig @@ -8,5 +8,6 @@ {% endblock %} {% block content %} - {% include 'ChillTaskBundle:SingleTask:_new.html.twig' %} + {% include '@ChillTask/SingleTask/_new.html.twig' %} + {% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig index 19bf70777..d9792ebde 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/show.html.twig @@ -27,6 +27,7 @@ {% block personcontent %} - {% include 'ChillTaskBundle:SingleTask:_show.html.twig' %} + {% include '@ChillTask/SingleTask/_show.html.twig' %} + {% endblock %} diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/showCourseTask.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/showCourseTask.html.twig index 643617a55..06ff62a60 100644 --- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/showCourseTask.html.twig +++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/showCourseTask.html.twig @@ -11,6 +11,7 @@ {% block content %} - {% include 'ChillTaskBundle:SingleTask:_show.html.twig' %} + {% include '@ChillTask/SingleTask/_show.html.twig' %} + {% endblock %}