Accidentally acced iCal function when merging Priority display, putting it back.
This commit is contained in:
@@ -140,6 +140,7 @@ class TaskFinder extends Base
|
|||||||
Project::TABLE.'.name AS project_name'
|
Project::TABLE.'.name AS project_name'
|
||||||
)
|
)
|
||||||
->join(User::TABLE, 'id', 'owner_id', Task::TABLE)
|
->join(User::TABLE, 'id', 'owner_id', Task::TABLE)
|
||||||
|
->left(User::TABLE, 'uc', 'id', Task::TABLE, 'creator_id')
|
||||||
->join(Category::TABLE, 'id', 'category_id', Task::TABLE)
|
->join(Category::TABLE, 'id', 'category_id', Task::TABLE)
|
||||||
->join(Column::TABLE, 'id', 'column_id', Task::TABLE)
|
->join(Column::TABLE, 'id', 'column_id', Task::TABLE)
|
||||||
->join(Swimlane::TABLE, 'id', 'swimlane_id', Task::TABLE)
|
->join(Swimlane::TABLE, 'id', 'swimlane_id', Task::TABLE)
|
||||||
@@ -364,6 +365,27 @@ class TaskFinder extends Base
|
|||||||
return $rq->fetch(PDO::FETCH_ASSOC);
|
return $rq->fetch(PDO::FETCH_ASSOC);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get iCal query
|
||||||
|
*
|
||||||
|
* @access public
|
||||||
|
* @return \PicoDb\Table
|
||||||
|
*/
|
||||||
|
public function getICalQuery()
|
||||||
|
{
|
||||||
|
return $this->db->table(Task::TABLE)
|
||||||
|
->left(User::TABLE, 'ua', 'id', Task::TABLE, 'owner_id')
|
||||||
|
->left(User::TABLE, 'uc', 'id', Task::TABLE, 'creator_id')
|
||||||
|
->columns(
|
||||||
|
Task::TABLE.'.*',
|
||||||
|
'ua.email AS assignee_email',
|
||||||
|
'ua.name AS assignee_name',
|
||||||
|
'ua.username AS assignee_username',
|
||||||
|
'uc.email AS creator_email',
|
||||||
|
'uc.username AS creator_username'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Count all tasks for a given project and status
|
* Count all tasks for a given project and status
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user