@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Generated ghost events should start generating as early as the range start minus the duration of the event.
Summary: Fixes T8347, Generated ghost events should start generating as early as the range start minus the duration of the event.
Test Plan: Create a year long weekly event, a year later, each day should have about 52 events.
Reviewers: #blessed_reviewers, epriestley
Reviewed By: #blessed_reviewers, epriestley
Subscribers: Korvin, epriestley
Maniphest Tasks: T8347
Differential Revision: https://secure.phabricator.com/D13069
+13
-5
+3
-2
src/applications/calendar/query/PhabricatorCalendarEventQuery.php
+3
-2
src/applications/calendar/query/PhabricatorCalendarEventQuery.php
···
101
101
foreach ($events as $event) {
102
102
$sequence_start = 0;
103
103
$instance_count = null;
104
+
$duration = $event->getDateTo() - $event->getDateFrom();
104
105
105
106
if ($event->getIsRecurring()) {
106
107
$frequency = $event->getFrequencyUnit();
107
108
$modify_key = '+1 '.$frequency;
108
109
109
110
if ($this->rangeBegin && $this->rangeBegin > $event->getDateFrom()) {
110
-
$max_date = $this->rangeBegin;
111
+
$max_date = $this->rangeBegin - $duration;
111
112
$date = $event->getDateFrom();
112
113
$datetime = PhabricatorTime::getDateTimeFromEpoch($date, $viewer);
113
114
···
120
121
121
122
$start = $this->rangeBegin;
122
123
} else {
123
-
$start = $event->getDateFrom();
124
+
$start = $event->getDateFrom() - $duration;
124
125
}
125
126
126
127
$date = $start;
-1
src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
-1
src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
···
307
307
$viewer = $this->requireViewer();
308
308
$list = new PHUIObjectItemListView();
309
309
foreach ($events as $event) {
310
-
// $href = '/E'.$event->getID();
311
310
$from = phabricator_datetime($event->getDateFrom(), $viewer);
312
311
$to = phabricator_datetime($event->getDateTo(), $viewer);
313
312
$creator_handle = $handles[$event->getUserPHID()];
+10
-2
src/view/phui/calendar/PHUICalendarMonthView.php
+10
-2
src/view/phui/calendar/PHUICalendarMonthView.php
···
89
89
}
90
90
}
91
91
92
+
$max_daily = 15;
93
+
$counter = 0;
94
+
92
95
$list = new PHUICalendarListView();
93
96
$list->setUser($this->user);
94
97
foreach ($all_day_events as $item) {
95
-
$list->addEvent($item);
98
+
if ($counter <= $max_daily) {
99
+
$list->addEvent($item);
100
+
}
101
+
$counter++;
96
102
}
97
103
foreach ($list_events as $item) {
98
-
$list->addEvent($item);
104
+
if ($counter <= $max_daily) {
105
+
$list->addEvent($item);
106
+
}
99
107
}
100
108
101
109
$uri = $this->getBrowseURI();