Page MenuHomePhabricator
Files F15338423

D13398.diff
No OneTemporary
Actions

D13398.diff
View Options

diff --git a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
--- a/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
+++ b/src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
@@ -264,11 +264,11 @@
$list = new PHUIObjectItemListView();
foreach ($events as $event) {
- $from = phabricator_datetime($event->getDateFrom(), $viewer);
$duration = '';
+ $event_date_info = $this->getEventDateLabel($event);
$creator_handle = $handles[$event->getUserPHID()];
-
$attendees = array();
+
foreach ($event->getInvitees() as $invitee) {
$attendees[] = $invitee->getInviteePHID();
}
@@ -287,8 +287,8 @@
$item = id(new PHUIObjectItemView())
->setHeader($viewer->renderHandle($event->getPHID())->render())
+ ->addAttribute($event_date_info)
->addAttribute($attendees)
- ->addIcon('none', $from)
->addIcon('none', $duration);
$list->addItem($item);
@@ -509,4 +509,41 @@
return false;
}
+
+ private function getEventDateLabel($event) {
+ $viewer = $this->requireViewer();
+
+ $from_datetime = PhabricatorTime::getDateTimeFromEpoch(
+ $event->getDateFrom(),
+ $viewer);
+ $to_datetime = PhabricatorTime::getDateTimeFromEpoch(
+ $event->getDateTo(),
+ $viewer);
+
+ $from_date_formatted = $from_datetime->format('Y m d');
+ $to_date_formatted = $to_datetime->format('Y m d');
+
+ if ($event->getIsAllDay()) {
+ if ($from_date_formatted == $to_date_formatted) {
+ return pht(
+ '%s, All Day',
+ phabricator_date($event->getDateFrom(), $viewer));
+ } else {
+ return pht(
+ '%s - %s, All Day',
+ phabricator_date($event->getDateFrom(), $viewer),
+ phabricator_date($event->getDateTo(), $viewer));
+ }
+ } else if ($from_date_formatted == $to_date_formatted) {
+ return pht(
+ '%s - %s',
+ phabricator_datetime($event->getDateFrom(), $viewer),
+ phabricator_time($event->getDateTo(), $viewer));
+ } else {
+ return pht(
+ '%s - %s',
+ phabricator_datetime($event->getDateFrom(), $viewer),
+ phabricator_datetime($event->getDateTo(), $viewer));
+ }
+ }
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 10, 10:56 AM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7386291
Default Alt Text
D13398.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility