Merge pull request #1 from fguillot/master

1 files changed, 23 insertions, 0 deletions

diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php
index d67372cc..d406b794 100644
--- a/app/Model/TaskFinder.php
+++ b/app/Model/TaskFinder.php
@@ -128,6 +128,7 @@ class TaskFinder extends Base
                 User::TABLE.'.username AS assignee_username',
                 User::TABLE.'.name AS assignee_name',
                 User::TABLE.'.email AS assignee_email',
+                User::TABLE.'.avatar_path AS assignee_avatar_path',
                 Category::TABLE.'.name AS category_name',
                 Category::TABLE.'.description AS category_description',
                 Column::TABLE.'.title AS column_name',
@@ -137,6 +138,7 @@ class TaskFinder extends Base
                 Project::TABLE.'.name AS project_name'
             )
             ->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(Column::TABLE, 'id', 'column_id', Task::TABLE)
             ->join(Swimlane::TABLE, 'id', 'swimlane_id', Task::TABLE)
@@ -362,6 +364,27 @@ class TaskFinder extends Base
     }
 
     /**
+     * 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
      *
      * @access public