summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorDzial Techniczny WMW Projekt s.c <techniczna@wmwprojekt.pl>2020-04-15 12:20:15 +0200
committerDzial Techniczny WMW Projekt s.c <techniczna@wmwprojekt.pl>2020-04-15 12:20:15 +0200
commitf5cc2aa17be9ba376002e20eb62bc1217f6667e8 (patch)
tree10557f4a22790d58b5baefb0949b3167f8f14481 /plugins
parent0dfe48b7fa475aade00a8ccf42e3dba99dfa3702 (diff)
Display only events with due-date set
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Calendar/Controller/CalendarController.php14
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,