@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
Calendar items in Upcoming Events query should link to events, not calendar
Summary: Closes T7933, Calendar items in Upcoming Events query should link to events, not calendar.
Test Plan: Open Upcoming Events query, click on an event, event detail view should open.
Reviewers: #blessed_reviewers, epriestley
Reviewed By: #blessed_reviewers, epriestley
Subscribers: Korvin, epriestley
Maniphest Tasks: T7933
Differential Revision: https://secure.phabricator.com/D12631
+5
-17
+5
-17
src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
+5
-17
src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
···
191
191
PhabricatorSavedQuery $query,
192
192
array $handles) {
193
193
assert_instances_of($events, 'PhabricatorCalendarEvent');
194
-
195
194
$viewer = $this->requireViewer();
196
-
197
195
$list = new PHUIObjectItemListView();
198
196
foreach ($events as $event) {
199
-
if ($event->getUserPHID() == $viewer->getPHID()) {
200
-
$href = '/E'.$event->getID();
201
-
} else {
202
-
$from = $event->getDateFrom();
203
-
$month = phabricator_format_local_time($from, $viewer, 'm');
204
-
$year = phabricator_format_local_time($from, $viewer, 'Y');
205
-
$uri = new PhutilURI($this->getApplicationURI());
206
-
$uri->setQueryParams(
207
-
array(
208
-
'month' => $month,
209
-
'year' => $year,
210
-
));
211
-
$href = (string) $uri;
212
-
}
197
+
$href = '/E'.$event->getID();
213
198
$from = phabricator_datetime($event->getDateFrom(), $viewer);
214
199
$to = phabricator_datetime($event->getDateTo(), $viewer);
215
200
$creator_handle = $handles[$event->getUserPHID()];
216
201
202
+
$name = (strlen($event->getName())) ?
203
+
$event->getName() : $event->getTerseSummary($viewer);
204
+
217
205
$color = ($event->getStatus() == PhabricatorCalendarEvent::STATUS_AWAY)
218
206
? 'red'
219
207
: 'yellow';
220
208
221
209
$item = id(new PHUIObjectItemView())
222
-
->setHeader($event->getTerseSummary($viewer))
210
+
->setHeader($name)
223
211
->setHref($href)
224
212
->setBarColor($color)
225
213
->addByline(pht('Creator: %s', $creator_handle->renderLink()))