From 3c8736c1fe593fe2ea30b09fa99ec2e34ca8c65a Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 15 Mar 2015 19:42:49 -0400
Subject: Calculate intersection between time tracking and timetable

---
 app/Controller/Calendar.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'app/Controller')

diff --git a/app/Controller/Calendar.php b/app/Controller/Calendar.php
index 1c7ac7c0..2a11edab 100644
--- a/app/Controller/Calendar.php
+++ b/app/Controller/Calendar.php
@@ -14,7 +14,7 @@ use Model\Task as TaskModel;
 class Calendar extends Base
 {
     /**
-     * Show calendar view
+     * Show calendar view for projects
      *
      * @access public
      */
@@ -59,9 +59,7 @@ class Calendar extends Base
             ->filterByDueDateRange($start, $end)
             ->toCalendarEvents();
 
-        $subtask_timeslots = $this->subtaskTimeTracking->getProjectCalendarEvents($project_id, $start, $end);
-
-        $this->response->json(array_merge($due_tasks, $subtask_timeslots));
+        $this->response->json($due_tasks);
     }
 
     /**
-- 
cgit v1.2.3