From fa6d19928abcfa03861e264222dbe46ad2fdc15a Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sat, 7 Feb 2015 18:36:16 -0500 Subject: Rename subtask model --- app/Model/SubtaskExport.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/Model/SubtaskExport.php') diff --git a/app/Model/SubtaskExport.php b/app/Model/SubtaskExport.php index 1e728c05..23dcc019 100644 --- a/app/Model/SubtaskExport.php +++ b/app/Model/SubtaskExport.php @@ -29,7 +29,7 @@ class SubtaskExport extends Base */ public function export($project_id, $from, $to) { - $this->subtask_status = $this->subTask->getStatusList(); + $this->subtask_status = $this->subtask->getStatusList(); $subtasks = $this->getSubtasks($project_id, $from, $to); $results = array($this->getColumns()); @@ -101,10 +101,10 @@ class SubtaskExport extends Base $to = $this->dateParser->removeTimeFromTimestamp(strtotime('+1 day', $this->dateParser->getTimestamp($to))); } - return $this->db->table(SubTask::TABLE) + return $this->db->table(Subtask::TABLE) ->eq('project_id', $project_id) ->columns( - SubTask::TABLE.'.*', + Subtask::TABLE.'.*', User::TABLE.'.username AS assignee_username', User::TABLE.'.name AS assignee_name', Task::TABLE.'.title AS task_title' @@ -113,7 +113,7 @@ class SubtaskExport extends Base ->lte('date_creation', $to) ->join(Task::TABLE, 'id', 'task_id') ->join(User::TABLE, 'id', 'user_id') - ->asc(SubTask::TABLE.'.id') + ->asc(Subtask::TABLE.'.id') ->findAll(); } } -- cgit v1.2.3