diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Api/Procedure/TaskProcedure.php | 6 | ||||
| -rw-r--r-- | app/Model/SubtaskModel.php | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/Api/Procedure/TaskProcedure.php b/app/Api/Procedure/TaskProcedure.php index af67f3de..c43e5876 100644 --- a/app/Api/Procedure/TaskProcedure.php +++ b/app/Api/Procedure/TaskProcedure.php @@ -89,7 +89,7 @@ class TaskProcedure extends BaseProcedure public function createTask($title, $project_id, $color_id = '', $column_id = 0, $owner_id = 0, $creator_id = 0, $date_due = '', $description = '', $category_id = 0, $score = 0, $swimlane_id = 0, $priority = 0, $recurrence_status = 0, $recurrence_trigger = 0, $recurrence_factor = 0, $recurrence_timeframe = 0, - $recurrence_basedate = 0, $reference = '', array $tags = array()) + $recurrence_basedate = 0, $reference = '', array $tags = array(), $date_started = '') { ProjectAuthorization::getInstance($this->container)->check($this->getClassName(), 'createTask', $project_id); @@ -121,6 +121,7 @@ class TaskProcedure extends BaseProcedure 'reference' => $reference, 'priority' => $priority, 'tags' => $tags, + 'date_started' => $date_started, ); list($valid, ) = $this->taskValidator->validateCreation($values); @@ -131,7 +132,7 @@ class TaskProcedure extends BaseProcedure public function updateTask($id, $title = null, $color_id = null, $owner_id = null, $date_due = null, $description = null, $category_id = null, $score = null, $priority = null, $recurrence_status = null, $recurrence_trigger = null, $recurrence_factor = null, - $recurrence_timeframe = null, $recurrence_basedate = null, $reference = null, $tags = null) + $recurrence_timeframe = null, $recurrence_basedate = null, $reference = null, $tags = null, $date_started = null) { TaskAuthorization::getInstance($this->container)->check($this->getClassName(), 'updateTask', $id); $project_id = $this->taskFinderModel->getProjectId($id); @@ -161,6 +162,7 @@ class TaskProcedure extends BaseProcedure 'reference' => $reference, 'priority' => $priority, 'tags' => $tags, + 'date_started' => $date_started, )); list($valid) = $this->taskValidator->validateApiModification($values); diff --git a/app/Model/SubtaskModel.php b/app/Model/SubtaskModel.php index 737a933d..ca2c8488 100644 --- a/app/Model/SubtaskModel.php +++ b/app/Model/SubtaskModel.php @@ -90,9 +90,11 @@ class SubtaskModel extends Base ->subquery($this->subtaskTimeTrackingModel->getTimerQuery($user_id), 'timer_start_date') ->eq('user_id', $user_id) ->eq(ProjectModel::TABLE.'.is_active', ProjectModel::ACTIVE) + ->eq(ColumnModel::TABLE.'.hide_in_dashboard', 0) ->in(SubtaskModel::TABLE.'.status', $status) ->join(TaskModel::TABLE, 'id', 'task_id') ->join(ProjectModel::TABLE, 'id', 'project_id', TaskModel::TABLE) + ->join(ColumnModel::TABLE, 'id', 'column_id', TaskModel::TABLE) ->callback(array($this, 'addStatusName')); } |