summaryrefslogtreecommitdiff
path: root/app/Controller
diff options
context:
space:
mode:
Diffstat (limited to 'app/Controller')
-rw-r--r--app/Controller/App.php4
-rw-r--r--app/Controller/Base.php4
-rw-r--r--app/Controller/Board.php2
-rw-r--r--app/Controller/Subtask.php30
-rw-r--r--app/Controller/Task.php4
5 files changed, 22 insertions, 22 deletions
diff --git a/app/Controller/App.php b/app/Controller/App.php
index 11e3915c..c4ed0fb8 100644
--- a/app/Controller/App.php
+++ b/app/Controller/App.php
@@ -2,7 +2,7 @@
namespace Controller;
-use Model\SubTask as SubTaskModel;
+use Model\Subtask as SubTaskModel;
/**
* Application controller
@@ -55,7 +55,7 @@ class App extends Base
->setUrl('app', $action, array('pagination' => 'subtasks'))
->setMax(10)
->setOrder('tasks.id')
- ->setQuery($this->subTask->getUserQuery($user_id, $status))
+ ->setQuery($this->subtask->getUserQuery($user_id, $status))
->calculateOnlyIf($this->request->getStringParam('pagination') === 'subtasks');
$project_paginator = $this->paginator
diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index d36e02c0..ac7e8907 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -40,7 +40,7 @@ use Symfony\Component\EventDispatcher\Event;
* @property \Model\ProjectAnalytic $projectAnalytic
* @property \Model\ProjectActivity $projectActivity
* @property \Model\ProjectDailySummary $projectDailySummary
- * @property \Model\SubTask $subTask
+ * @property \Model\Subtask $subtask
* @property \Model\Swimlane $swimlane
* @property \Model\Task $task
* @property \Model\TaskCreation $taskCreation
@@ -168,7 +168,7 @@ abstract class Base
$this->handleAuthentication();
$this->handleAuthorization($controller, $action);
- $this->session['has_subtask_inprogress'] = $this->subTask->hasSubtaskInProgress($this->userSession->getId());
+ $this->session['has_subtask_inprogress'] = $this->subtask->hasSubtaskInProgress($this->userSession->getId());
}
}
diff --git a/app/Controller/Board.php b/app/Controller/Board.php
index 3671b5fc..c9622f86 100644
--- a/app/Controller/Board.php
+++ b/app/Controller/Board.php
@@ -410,7 +410,7 @@ class Board extends Base
{
$task = $this->getTask();
$this->response->html($this->template->render('board/subtasks', array(
- 'subtasks' => $this->subTask->getAll($task['id']),
+ 'subtasks' => $this->subtask->getAll($task['id']),
'task' => $task,
)));
}
diff --git a/app/Controller/Subtask.php b/app/Controller/Subtask.php
index a6cec435..c7ec00d1 100644
--- a/app/Controller/Subtask.php
+++ b/app/Controller/Subtask.php
@@ -2,10 +2,10 @@
namespace Controller;
-use Model\SubTask as SubtaskModel;
+use Model\Subtask as SubtaskModel;
/**
- * SubTask controller
+ * Subtask controller
*
* @package controller
* @author Frederic Guillot
@@ -20,7 +20,7 @@ class Subtask extends Base
*/
private function getSubtask()
{
- $subtask = $this->subTask->getById($this->request->getIntegerParam('subtask_id'));
+ $subtask = $this->subtask->getById($this->request->getIntegerParam('subtask_id'));
if (! $subtask) {
$this->notfound();
@@ -63,11 +63,11 @@ class Subtask extends Base
$task = $this->getTask();
$values = $this->request->getValues();
- list($valid, $errors) = $this->subTask->validateCreation($values);
+ list($valid, $errors) = $this->subtask->validateCreation($values);
if ($valid) {
- if ($this->subTask->create($values)) {
+ if ($this->subtask->create($values)) {
$this->session->flash(t('Sub-task added successfully.'));
}
else {
@@ -98,7 +98,7 @@ class Subtask extends Base
'values' => empty($values) ? $subtask : $values,
'errors' => $errors,
'users_list' => $this->projectPermission->getMemberList($task['project_id']),
- 'status_list' => $this->subTask->getStatusList(),
+ 'status_list' => $this->subtask->getStatusList(),
'subtask' => $subtask,
'task' => $task,
)));
@@ -115,11 +115,11 @@ class Subtask extends Base
$this->getSubtask();
$values = $this->request->getValues();
- list($valid, $errors) = $this->subTask->validateModification($values);
+ list($valid, $errors) = $this->subtask->validateModification($values);
if ($valid) {
- if ($this->subTask->update($values)) {
+ if ($this->subtask->update($values)) {
$this->session->flash(t('Sub-task updated successfully.'));
}
else {
@@ -159,7 +159,7 @@ class Subtask extends Base
$task = $this->getTask();
$subtask = $this->getSubtask();
- if ($this->subTask->remove($subtask['id'])) {
+ if ($this->subtask->remove($subtask['id'])) {
$this->session->flash(t('Sub-task removed successfully.'));
}
else {
@@ -180,14 +180,14 @@ class Subtask extends Base
$subtask = $this->getSubtask();
$redirect = $this->request->getStringParam('redirect', 'task');
- $this->subTask->toggleStatus($subtask['id']);
+ $this->subtask->toggleStatus($subtask['id']);
if ($redirect === 'board') {
- $this->session['has_subtask_inprogress'] = $this->subTask->hasSubtaskInProgress($this->userSession->getId());
+ $this->session['has_subtask_inprogress'] = $this->subtask->hasSubtaskInProgress($this->userSession->getId());
$this->response->html($this->template->render('board/subtasks', array(
- 'subtasks' => $this->subTask->getAll($task['id']),
+ 'subtasks' => $this->subtask->getAll($task['id']),
'task' => $task,
)));
}
@@ -210,7 +210,7 @@ class Subtask extends Base
SubtaskModel::STATUS_TODO => t('Todo'),
SubtaskModel::STATUS_DONE => t('Done'),
),
- 'subtask_inprogress' => $this->subTask->getSubtaskInProgress($this->userSession->getId()),
+ 'subtask_inprogress' => $this->subtask->getSubtaskInProgress($this->userSession->getId()),
'subtask' => $subtask,
'task' => $task,
'redirect' => $this->request->getStringParam('redirect'),
@@ -229,13 +229,13 @@ class Subtask extends Base
$values = $this->request->getValues();
// Change status of the previous in progress subtask
- $this->subTask->update(array(
+ $this->subtask->update(array(
'id' => $values['id'],
'status' => $values['status'],
));
// Set the current subtask to in pogress
- $this->subTask->update(array(
+ $this->subtask->update(array(
'id' => $subtask['id'],
'status' => SubtaskModel::STATUS_INPROGRESS,
));
diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 205e480f..626ac9e6 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -35,7 +35,7 @@ class Task extends Base
$this->response->html($this->template->layout('task/public', array(
'project' => $project,
'comments' => $this->comment->getAll($task['id']),
- 'subtasks' => $this->subTask->getAll($task['id']),
+ 'subtasks' => $this->subtask->getAll($task['id']),
'task' => $task,
'columns_list' => $this->board->getColumnsList($task['project_id']),
'colors_list' => $this->color->getList(),
@@ -54,7 +54,7 @@ class Task extends Base
public function show()
{
$task = $this->getTask();
- $subtasks = $this->subTask->getAll($task['id']);
+ $subtasks = $this->subtask->getAll($task['id']);
$values = array(
'id' => $task['id'],
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-21 08:51:19 +0000