summaryrefslogtreecommitdiff
path: root/app/Controller
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-03-15 19:42:49 -0400
committerFrederic Guillot <fred@kanboard.net>2015-03-15 19:42:49 -0400
commit3c8736c1fe593fe2ea30b09fa99ec2e34ca8c65a (patch)
tree16ec59c17982648939155cedecf817a50781001d /app/Controller
parent084272c60ea97f3a835cfccbb3303227d00085e8 (diff)
Calculate intersection between time tracking and timetable
Diffstat (limited to 'app/Controller')
-rw-r--r--app/Controller/Calendar.php6
1 files changed, 2 insertions, 4 deletions
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);
}
/**