Page MenuHomePhabricator
Files F15336505

D16299.diff
No OneTemporary
Actions

D16299.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,15 +264,6 @@
$list = new PHUIObjectItemListView();
foreach ($events as $event) {
- $attendees = array();
-
- foreach ($event->getInvitees() as $invitee) {
- $status_attending = PhabricatorCalendarEventInvitee::STATUS_ATTENDING;
- if ($invitee->getStatus() === $status_attending) {
- $attendees[] = $invitee->getInviteePHID();
- }
- }
-
if ($event->getIsGhostEvent()) {
$monogram = $event->getParentEvent()->getMonogram();
$index = $event->getSequenceIndex();
@@ -286,18 +277,42 @@
->setObject($event)
->setObjectName($monogram)
->setHeader($event->getName())
- ->setHref($event->getURI())
- ->addAttribute($event->renderEventDate($viewer, false));
+ ->setHref($event->getURI());
+
+ $item->addAttribute($event->renderEventDate($viewer, false));
+
+ if ($event->isCancelledEvent()) {
+ $status_icon = 'fa-times red';
+ $status_label = pht('Cancelled');
+ $item->setDisabled(true);
+ } else if ($viewer->isLoggedIn()) {
+ $status = $event->getUserInviteStatus($viewer->getPHID());
+ switch ($status) {
+ case PhabricatorCalendarEventInvitee::STATUS_ATTENDING:
+ $status_icon = 'fa-check-circle green';
+ $status_label = pht('Attending');
+ break;
+ case PhabricatorCalendarEventInvitee::STATUS_INVITED:
+ $status_icon = 'fa-user-plus green';
+ $status_label = pht('Invited');
+ break;
+ case PhabricatorCalendarEventInvitee::STATUS_DECLINED:
+ $status_icon = 'fa-times grey';
+ $status_label = pht('Declined');
+ break;
+ default:
+ $status_icon = $event->getIcon().' grey';
+ $status_label = null;
+ break;
+ }
+ }
- if ($attendees) {
- $attending = pht(
- 'Attending: %s',
- $viewer->renderHandleList($attendees)
- ->setAsInline(1)
- ->render());
+ $item->setStatusIcon($status_icon, $status_label);
- $item->addAttribute($attending);
- }
+ $host = pht(
+ 'Hosted by %s',
+ $viewer->renderHandle($event->getHostPHID()));
+ $item->addByline($host);
$list->addItem($item);
}

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 9, 7:11 PM (2 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7390833
Default Alt Text
D16299.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility