diff --git a/Controller/SingleTaskController.php b/Controller/SingleTaskController.php index 7cc2f3bb0..2b105e7ff 100644 --- a/Controller/SingleTaskController.php +++ b/Controller/SingleTaskController.php @@ -18,8 +18,6 @@ use Chill\MainBundle\Pagination\PaginatorFactory; use Chill\TaskBundle\Repository\SingleTaskRepository; use Chill\MainBundle\Entity\User; use Chill\PersonBundle\Security\Authorization\PersonVoter; -use Chill\TaskBundle\Repository\SingleTaskRepository; -use Chill\MainBundle\Pagination\PaginatorFactory; class SingleTaskController extends Controller { @@ -52,8 +50,8 @@ class SingleTaskController extends Controller ->setType('task_default') ; - // $this->denyAccessUnlessGranted(TaskVoter::CREATE, $task, 'You are not ' - // . 'allowed to create this task'); + $this->denyAccessUnlessGranted(TaskVoter::CREATE, $task, 'You are not ' + . 'allowed to create this task'); $form = $this->setCreateForm($task, new Role(TaskVoter::CREATE)); @@ -68,7 +66,7 @@ class SingleTaskController extends Controller $this->addFlash('success', "The task is created"); - return $this->redirectToRoute('chill_task_task_list', [ + return $this->redirectToRoute('chill_task_task_list_by_person', [ 'personId' => $task->getPerson()->getId() ]); @@ -112,8 +110,8 @@ class SingleTaskController extends Controller throw $this->createNotFoundException("Invalid person id"); } } - // $this->denyAccessUnlessGranted(TaskVoter::SEE, $task, 'You are not ' - // . 'allowed to view this task'); + $this->denyAccessUnlessGranted(TaskVoter::SHOW, $task, 'You are not ' + . 'allowed to view this task'); if (!$task) { throw $this->createNotFoundException('Unable to find Task entity.'); @@ -152,8 +150,8 @@ class SingleTaskController extends Controller throw $this->createNotFoundException("Invalid person id"); } } - // $this->denyAccessUnlessGranted(TaskVoter::UPDATE, $task, 'You are not ' - // . 'allowed to edit this task'); + $this->denyAccessUnlessGranted(TaskVoter::UPDATE, $task, 'You are not ' + . 'allowed to edit this task'); if (!$task) { throw $this->createNotFoundException('Unable to find Task entity.'); @@ -172,7 +170,7 @@ class SingleTaskController extends Controller $this->addFlash('success', "Success : task updated!"); - return $this->redirectToRoute('chill_task_task_list', [ + return $this->redirectToRoute('chill_task_task_list_by_person', [ 'personId' => $task->getPerson()->getId() ]); diff --git a/Resources/views/SingleTask/show.html.twig b/Resources/views/SingleTask/show.html.twig index 6e073772a..0c0389c78 100644 --- a/Resources/views/SingleTask/show.html.twig +++ b/Resources/views/SingleTask/show.html.twig @@ -44,13 +44,13 @@
{{ 'End date'|trans }}
{{ task.endDate|localizeddate('long', 'none') }}
-
{{ 'Warning interval'|trans }}
-
{{ task.warningInterval|localizeddate('long', 'none') }}
+
{{ 'Warning date'|trans }}
+
{{ task.warningDate|localizeddate('long', 'none') }}