diff --git a/app/Controller/CommentController.php b/app/Controller/CommentController.php index 8360c641c..8557b36a6 100644 --- a/app/Controller/CommentController.php +++ b/app/Controller/CommentController.php @@ -24,15 +24,12 @@ class CommentController extends BaseController */ public function create(array $values = array(), array $errors = array()) { - $project = $this->getProject(); $task = $this->getTask(); - $values['project_id'] = $task['project_id']; $this->response->html($this->helper->layout->task('comment/create', array( 'values' => $values, 'errors' => $errors, - 'task' => $task, - 'project' => $project, + 'task' => $task ))); } @@ -57,7 +54,7 @@ class CommentController extends BaseController $this->flash->failure(t('Unable to create your comment.')); } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']), 'comments'), true); } else { $this->create($values, $errors); } @@ -81,8 +78,6 @@ class CommentController extends BaseController $values = $comment; } - $values['project_id'] = $task['project_id']; - $this->response->html($this->template->render('comment/edit', array( 'values' => $values, 'errors' => $errors, @@ -115,7 +110,7 @@ class CommentController extends BaseController $this->flash->failure(t('Unable to update your comment.')); } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true); return; } @@ -156,7 +151,7 @@ class CommentController extends BaseController $this->flash->failure(t('Unable to remove this comment.')); } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']), 'comments'), true); } /** @@ -173,7 +168,7 @@ class CommentController extends BaseController $this->response->redirect($this->helper->url->to( 'TaskViewController', 'show', - array('task_id' => $task['id'], 'project_id' => $task['project_id']), + array('task_id' => $task['id']), 'comments' )); } diff --git a/app/Controller/CommentMailController.php b/app/Controller/CommentMailController.php index 920f786a5..575b8509f 100644 --- a/app/Controller/CommentMailController.php +++ b/app/Controller/CommentMailController.php @@ -12,15 +12,13 @@ class CommentMailController extends BaseController { public function create(array $values = array(), array $errors = array()) { - $project = $this->getProject(); $task = $this->getTask(); $this->response->html($this->helper->layout->task('comment_mail/create', array( 'values' => $values, 'errors' => $errors, 'task' => $task, - 'project' => $project, - 'members' => $this->projectPermissionModel->getMembersWithEmail($project['id']), + 'members' => $this->projectPermissionModel->getMembersWithEmail($task['project_id']), ))); } @@ -43,7 +41,7 @@ class CommentMailController extends BaseController $this->flash->failure(t('Unable to create your comment.')); } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']), 'comments'), true); } else { $this->create($values, $errors); } diff --git a/app/Controller/ExternalTaskCreationController.php b/app/Controller/ExternalTaskCreationController.php index 0d87c0b68..6ad515d20 100644 --- a/app/Controller/ExternalTaskCreationController.php +++ b/app/Controller/ExternalTaskCreationController.php @@ -91,7 +91,7 @@ class ExternalTaskCreationController extends BaseController } else { $taskId = $this->taskCreationModel->create($values); $this->flash->success(t('Task created successfully.')); - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $project['id'], 'task_id' => $taskId)), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $taskId)), true); } } } diff --git a/app/Controller/SubtaskController.php b/app/Controller/SubtaskController.php index d5db9b2ef..8144d18f9 100644 --- a/app/Controller/SubtaskController.php +++ b/app/Controller/SubtaskController.php @@ -37,7 +37,7 @@ class SubtaskController extends BaseController 'task' => $task, ))); } - + /** * Prepare form values * @@ -86,7 +86,7 @@ class SubtaskController extends BaseController if (! $this->subtaskModel->create($subtaskValues)) { $this->flash->failure(t('Unable to create your sub-task.')); - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id']), 'subtasks'), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']), 'subtasks'), true); return false; } @@ -110,7 +110,7 @@ class SubtaskController extends BaseController } } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id']), 'subtasks'), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']), 'subtasks'), true); } /** @@ -160,7 +160,7 @@ class SubtaskController extends BaseController $this->flash->failure(t('Unable to update your sub-task.')); } - return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true); } return $this->edit($values, $errors); @@ -199,7 +199,7 @@ class SubtaskController extends BaseController $this->flash->failure(t('Unable to remove this sub-task.')); } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true); } /** diff --git a/app/Controller/SubtaskConverterController.php b/app/Controller/SubtaskConverterController.php index dafbb7e00..5be032ea6 100644 --- a/app/Controller/SubtaskConverterController.php +++ b/app/Controller/SubtaskConverterController.php @@ -23,11 +23,10 @@ class SubtaskConverterController extends BaseController public function save() { - $project = $this->getProject(); $task = $this->getTask(); $subtask = $this->getSubtask($task); - $task_id = $this->subtaskTaskConversionModel->convertToTask($project['id'], $subtask['id']); + $task_id = $this->subtaskTaskConversionModel->convertToTask($task['project_id'], $subtask['id']); if ($task_id !== false) { $this->flash->success(t('Subtask converted to task successfully.')); @@ -35,6 +34,6 @@ class SubtaskConverterController extends BaseController $this->flash->failure(t('Unable to convert the subtask.')); } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $project['id'], 'task_id' => $task_id)), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task_id)), true); } } diff --git a/app/Controller/SubtaskRestrictionController.php b/app/Controller/SubtaskRestrictionController.php index 315b023d1..e777b1dca 100644 --- a/app/Controller/SubtaskRestrictionController.php +++ b/app/Controller/SubtaskRestrictionController.php @@ -56,6 +56,6 @@ class SubtaskRestrictionController extends BaseController 'status' => SubtaskModel::STATUS_INPROGRESS, )); - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true); } } diff --git a/app/Controller/TaskDuplicationController.php b/app/Controller/TaskDuplicationController.php index 6f81b25a9..6ebb6d592 100644 --- a/app/Controller/TaskDuplicationController.php +++ b/app/Controller/TaskDuplicationController.php @@ -25,10 +25,10 @@ class TaskDuplicationController extends BaseController if ($task_id > 0) { $this->flash->success(t('Task created successfully.')); - return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task_id))); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task_id))); } else { $this->flash->failure(t('Unable to create this task.')); - return $this->response->redirect($this->helper->url->to('TaskDuplicationController', 'duplicate', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); + return $this->response->redirect($this->helper->url->to('TaskDuplicationController', 'duplicate', array('task_id' => $task['id'])), true); } } @@ -57,7 +57,7 @@ class TaskDuplicationController extends BaseController $values['category_id'], $values['owner_id'])) { $this->flash->success(t('Task updated successfully.')); - return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $values['project_id'], 'task_id' => $task['id']))); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']))); } $this->flash->failure(t('Unable to update your task.')); diff --git a/app/Controller/TaskExternalLinkController.php b/app/Controller/TaskExternalLinkController.php index 946451fcb..02cf472d3 100644 --- a/app/Controller/TaskExternalLinkController.php +++ b/app/Controller/TaskExternalLinkController.php @@ -85,7 +85,7 @@ class TaskExternalLinkController extends BaseController $this->flash->success(t('Unable to create your link.')); } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true); } else { $provider = $this->externalLinkManager->getProvider($values['link_type']); $this->response->html($this->template->render('task_external_link/create', array( @@ -140,7 +140,7 @@ class TaskExternalLinkController extends BaseController if ($valid && $this->taskExternalLinkModel->update($values)) { $this->flash->success(t('Link updated successfully.')); - return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true); } return $this->edit($values, $errors); @@ -179,6 +179,6 @@ class TaskExternalLinkController extends BaseController $this->flash->failure(t('Unable to remove this link.')); } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']))); } } diff --git a/app/Controller/TaskFileController.php b/app/Controller/TaskFileController.php index 4c489238c..b3192b3a7 100644 --- a/app/Controller/TaskFileController.php +++ b/app/Controller/TaskFileController.php @@ -21,7 +21,7 @@ class TaskFileController extends BaseController if ($this->request->isPost() && $this->taskFileModel->uploadScreenshot($task['id'], $this->request->getValue('screenshot')) !== false) { $this->flash->success(t('Screenshot uploaded successfully.')); - return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true); } return $this->response->html($this->template->render('task_file/screenshot', array( @@ -66,7 +66,7 @@ class TaskFileController extends BaseController $this->flash->failure(t('Unable to upload files, check the permissions of your data folder.')); } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true); } } @@ -87,7 +87,7 @@ class TaskFileController extends BaseController $this->flash->failure(t('Unable to remove this file.')); } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']))); } /** diff --git a/app/Controller/TaskInternalLinkController.php b/app/Controller/TaskInternalLinkController.php index 02cc15c4d..7ab01374a 100644 --- a/app/Controller/TaskInternalLinkController.php +++ b/app/Controller/TaskInternalLinkController.php @@ -65,7 +65,7 @@ class TaskInternalLinkController extends BaseController )); } - return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true); } $errors = array('title' => array(t('The exact same link already exists'))); @@ -123,7 +123,7 @@ class TaskInternalLinkController extends BaseController if ($valid) { if ($this->taskLinkModel->update($values['id'], $values['task_id'], $values['opposite_task_id'], $values['link_id'])) { $this->flash->success(t('Link updated successfully.')); - return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])).'#links'); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])).'#links'); } $this->flash->failure(t('Unable to update your link.')); @@ -165,6 +165,6 @@ class TaskInternalLinkController extends BaseController $this->flash->failure(t('Unable to remove this link.')); } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']))); } } diff --git a/app/Controller/TaskMailController.php b/app/Controller/TaskMailController.php index 9e753af1d..5197f4fad 100644 --- a/app/Controller/TaskMailController.php +++ b/app/Controller/TaskMailController.php @@ -12,15 +12,13 @@ class TaskMailController extends BaseController { public function create(array $values = array(), array $errors = array()) { - $project = $this->getProject(); $task = $this->getTask(); $this->response->html($this->helper->layout->task('task_mail/create', array( 'values' => $values, 'errors' => $errors, 'task' => $task, - 'project' => $project, - 'members' => $this->projectPermissionModel->getMembersWithEmail($project['id']), + 'members' => $this->projectPermissionModel->getMembersWithEmail($task['project_id']), ))); } @@ -41,7 +39,7 @@ class TaskMailController extends BaseController 'task_id' => $task['id'], )); - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), 'comments'), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']), 'comments'), true); } else { $this->create($values, $errors); } diff --git a/app/Controller/TaskModificationController.php b/app/Controller/TaskModificationController.php index b2b94c3d5..3e6f5d178 100644 --- a/app/Controller/TaskModificationController.php +++ b/app/Controller/TaskModificationController.php @@ -23,7 +23,7 @@ class TaskModificationController extends BaseController if (! $this->helper->projectRole->canUpdateTask($task)) { throw new AccessForbiddenException(t('You are not allowed to update tasks assigned to someone else.')); } - + if (! $this->helper->projectRole->canChangeAssignee($task)) { throw new AccessForbiddenException(t('You are not allowed to change the assignee.')); } @@ -67,7 +67,7 @@ class TaskModificationController extends BaseController $this->response->redirect($this->helper->url->to('DashboardController', 'tasks', ['user_id' => $this->userSession->getId()])); break; default: - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', ['project_id' => $task['project_id'], 'task_id' => $task['id']])); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', ['task_id' => $task['id']])); } } @@ -146,7 +146,7 @@ class TaskModificationController extends BaseController if ($valid && $this->updateTask($task, $values, $errors)) { $this->flash->success(t('Task updated successfully.')); - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true); } else { $this->flash->failure(t('Unable to update your task.')); $this->edit($values, $errors); diff --git a/app/Controller/TaskMovePositionController.php b/app/Controller/TaskMovePositionController.php index 802eadeda..f630641a0 100644 --- a/app/Controller/TaskMovePositionController.php +++ b/app/Controller/TaskMovePositionController.php @@ -47,6 +47,6 @@ class TaskMovePositionController extends BaseController $values['swimlane_id'] ); - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']))); } } diff --git a/app/Controller/TaskRecurrenceController.php b/app/Controller/TaskRecurrenceController.php index 7f14cb534..cd23ea3f5 100644 --- a/app/Controller/TaskRecurrenceController.php +++ b/app/Controller/TaskRecurrenceController.php @@ -58,7 +58,7 @@ class TaskRecurrenceController extends BaseController $this->flash->failure(t('Unable to update your task.')); } - return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('project_id' => $task['project_id'], 'task_id' => $task['id'])), true); + return $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true); } return $this->edit($values, $errors); diff --git a/app/Controller/TaskStatusController.php b/app/Controller/TaskStatusController.php index 56d38400d..5dbd07ec7 100644 --- a/app/Controller/TaskStatusController.php +++ b/app/Controller/TaskStatusController.php @@ -52,7 +52,7 @@ class TaskStatusController extends BaseController $this->flash->failure($failure_message); } - $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])), true); + $this->response->redirect($this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'])), true); } else { $this->response->html($this->template->render($template, array( 'task' => $task, diff --git a/app/Controller/TaskViewController.php b/app/Controller/TaskViewController.php index 05c59bc9b..4e348aa2c 100644 --- a/app/Controller/TaskViewController.php +++ b/app/Controller/TaskViewController.php @@ -107,7 +107,7 @@ class TaskViewController extends BaseController $task = $this->getTask(); $subtask_paginator = $this->paginator - ->setUrl('TaskViewController', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'pagination' => 'subtasks')) + ->setUrl('TaskViewController', 'timetracking', array('task_id' => $task['id'], 'pagination' => 'subtasks')) ->setMax(15) ->setOrder('start') ->setDirection('DESC') diff --git a/app/Formatter/SubtaskTimeTrackingCalendarFormatter.php b/app/Formatter/SubtaskTimeTrackingCalendarFormatter.php index b7b81d87c..034617262 100644 --- a/app/Formatter/SubtaskTimeTrackingCalendarFormatter.php +++ b/app/Formatter/SubtaskTimeTrackingCalendarFormatter.php @@ -28,7 +28,7 @@ class SubtaskTimeTrackingCalendarFormatter extends BaseFormatter implements Form 'backgroundColor' => $this->colorModel->getBackgroundColor($row['color_id']), 'borderColor' => $this->colorModel->getBorderColor($row['color_id']), 'textColor' => 'black', - 'url' => $this->helper->url->to('TaskViewController', 'show', array('task_id' => $row['task_id'], 'project_id' => $row['project_id'])), + 'url' => $this->helper->url->to('TaskViewController', 'show', array('task_id' => $row['task_id'])), 'editable' => false, ); } diff --git a/app/Formatter/TaskApiFormatter.php b/app/Formatter/TaskApiFormatter.php index 60840bebe..f2e25d087 100644 --- a/app/Formatter/TaskApiFormatter.php +++ b/app/Formatter/TaskApiFormatter.php @@ -28,7 +28,7 @@ class TaskApiFormatter extends BaseFormatter implements FormatterInterface public function format() { if (! empty($this->task)) { - $this->task['url'] = $this->helper->url->to('TaskViewController', 'show', array('task_id' => $this->task['id'], 'project_id' => $this->task['project_id']), '', true); + $this->task['url'] = $this->helper->url->to('TaskViewController', 'show', array('task_id' => $this->task['id']), '', true); $this->task['color'] = $this->colorModel->getColorProperties($this->task['color_id']); } diff --git a/app/Formatter/TaskICalFormatter.php b/app/Formatter/TaskICalFormatter.php index 387074e51..abe595fdd 100644 --- a/app/Formatter/TaskICalFormatter.php +++ b/app/Formatter/TaskICalFormatter.php @@ -128,7 +128,7 @@ class TaskICalFormatter extends BaseFormatter implements FormatterInterface $vEvent->setSummary(t('#%d', $task['id']).' '.$task['title']); $vEvent->setDescription($task['description']); $vEvent->setDescriptionHTML($this->helper->text->markdown($task['description'])); - $vEvent->setUrl($this->helper->url->base().$this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']))); + $vEvent->setUrl($this->helper->url->base().$this->helper->url->to('TaskViewController', 'show', array('task_id' => $task['id']))); if (! empty($task['owner_id'])) { $attendees = new Attendees; diff --git a/app/Helper/SubtaskHelper.php b/app/Helper/SubtaskHelper.php index c1c92aa0d..aa3a47655 100644 --- a/app/Helper/SubtaskHelper.php +++ b/app/Helper/SubtaskHelper.php @@ -82,10 +82,10 @@ class SubtaskHelper extends Base $html = ''; if ($subtask['is_timer_started']) { - $html .= $this->helper->url->icon('pause', t('Stop timer'), 'SubtaskStatusController', 'timer', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'js-subtask-toggle-timer'); + $html .= $this->helper->url->icon('pause', t('Stop timer'), 'SubtaskStatusController', 'timer', array('timer' => 'stop', 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'js-subtask-toggle-timer'); $html .= ' (' . $this->helper->dt->age($subtask['timer_start_date']) .')'; } else { - $html .= $this->helper->url->icon('play-circle-o', t('Start timer'), 'SubtaskStatusController', 'timer', array('timer' => 'start', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'js-subtask-toggle-timer'); + $html .= $this->helper->url->icon('play-circle-o', t('Start timer'), 'SubtaskStatusController', 'timer', array('timer' => 'start', 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'js-subtask-toggle-timer'); } $html .= ''; diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php index 669421880..88e5c2d3d 100644 --- a/app/ServiceProvider/RouteProvider.php +++ b/app/ServiceProvider/RouteProvider.php @@ -89,14 +89,14 @@ class RouteProvider implements ServiceProviderInterface $container['route']->addRoute('project/:project_id/import', 'TaskImportController', 'show'); // Task routes - $container['route']->addRoute('project/:project_id/task/:task_id', 'TaskViewController', 'show'); + $container['route']->addRoute('task/:task_id', 'TaskViewController', 'show'); $container['route']->addRoute('t/:task_id', 'TaskViewController', 'show'); $container['route']->addRoute('public/task/:task_id/:token', 'TaskViewController', 'readonly'); - $container['route']->addRoute('project/:project_id/task/:task_id/activity', 'ActivityController', 'task'); - $container['route']->addRoute('project/:project_id/task/:task_id/transitions', 'TaskViewController', 'transitions'); - $container['route']->addRoute('project/:project_id/task/:task_id/analytics', 'TaskViewController', 'analytics'); - $container['route']->addRoute('project/:project_id/task/:task_id/time-tracking', 'TaskViewController', 'timetracking'); + $container['route']->addRoute('task/:task_id/activity', 'ActivityController', 'task'); + $container['route']->addRoute('task/:task_id/transitions', 'TaskViewController', 'transitions'); + $container['route']->addRoute('task/:task_id/analytics', 'TaskViewController', 'analytics'); + $container['route']->addRoute('task/:task_id/time-tracking', 'TaskViewController', 'timetracking'); // Exports $container['route']->addRoute('export/tasks/:project_id', 'ExportController', 'tasks'); diff --git a/app/Template/analytic/time_comparison.php b/app/Template/analytic/time_comparison.php index 754c68f2f..bf2cd12df 100644 --- a/app/Template/analytic/time_comparison.php +++ b/app/Template/analytic/time_comparison.php @@ -36,10 +36,10 @@ getCollection() as $task): ?>