diff options
| -rw-r--r-- | plugins/Calendar/Controller/CalendarController.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/Calendar/Controller/CalendarController.php b/plugins/Calendar/Controller/CalendarController.php index 94a1e5e2..f8a50f05 100644 --- a/plugins/Calendar/Controller/CalendarController.php +++ b/plugins/Calendar/Controller/CalendarController.php @@ -51,7 +51,7 @@ class CalendarController extends BaseController ->withFilter(new TaskDueDateRangeFilter(array($startRange, $endRange))) ->format($this->taskCalendarFormatter->setColumns('date_due')); - $startAndDueDateQueryBuilder = $this->taskLexer->build($search) + /*$startAndDueDateQueryBuilder = $this->taskLexer->build($search) ->withFilter(new TaskProjectFilter($projectId)); $startAndDueDateQueryBuilder @@ -59,11 +59,11 @@ class CalendarController extends BaseController ->addCondition($this->getConditionForTasksWithStartAndDueDate($startRange, $endRange, $startColumn, 'date_due')); $startAndDueDateEvents = $startAndDueDateQueryBuilder - ->format($this->taskCalendarFormatter->setColumns($startColumn, 'date_due')); + ->format($this->taskCalendarFormatter->setColumns($startColumn, 'date_due')); - $events = array_merge($dueDateOnlyEvents, $startAndDueDateEvents); + $events = array_merge($dueDateOnlyEvents, $startAndDueDateEvents);*/ - $events = $this->hook->merge('controller:calendar:project:events', $events, array( + $events = $this->hook->merge('controller:calendar:project:events', $dueDateOnlyEvents, array( 'project_id' => $projectId, 'start' => $startRange, 'end' => $endRange, @@ -85,7 +85,7 @@ class CalendarController extends BaseController ->withFilter(new TaskDueDateRangeFilter(array($startRange, $endRange))) ->format($this->taskCalendarFormatter->setColumns('date_due')); - $startAndDueDateQueryBuilder = $this->taskQuery + /*$startAndDueDateQueryBuilder = $this->taskQuery ->withFilter(new TaskAssigneeFilter($user_id)) ->withFilter(new TaskStatusFilter(TaskModel::STATUS_OPEN)); @@ -96,9 +96,9 @@ class CalendarController extends BaseController $startAndDueDateEvents = $startAndDueDateQueryBuilder ->format($this->taskCalendarFormatter->setColumns($startColumn, 'date_due')); - $events = array_merge($dueDateOnlyEvents, $startAndDueDateEvents); + $events = array_merge($dueDateOnlyEvents, $startAndDueDateEvents);*/ - $events = $this->hook->merge('controller:calendar:user:events', $events, array( + $events = $this->hook->merge('controller:calendar:user:events', $dueDateOnlyEvents, array( 'user_id' => $user_id, 'start' => $startRange, 'end' => $endRange, |