Page MenuHomePhabricator
Files F15468602

D16297.id39198.diff
No OneTemporary
Actions

D16297.id39198.diff
View Options

diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
@@ -68,10 +68,15 @@
$viewer = $this->getViewer();
$id = $event->getID();
- $is_cancelled = $event->getIsCancelled();
- $icon = $is_cancelled ? ('fa-ban') : ('fa-check');
- $color = $is_cancelled ? ('red') : ('bluegrey');
- $status = $is_cancelled ? pht('Cancelled') : pht('Active');
+ if ($event->isCancelledEvent()) {
+ $icon = 'fa-ban';
+ $color = 'red';
+ $status = pht('Cancelled');
+ } else {
+ $icon = 'fa-check';
+ $color = 'bluegrey';
+ $status = pht('Active');
+ }
$invite_status = $event->getUserInviteStatus($viewer->getPHID());
$status_invited = PhabricatorCalendarEventInvitee::STATUS_INVITED;
@@ -82,7 +87,7 @@
->setHeader($event->getName())
->setStatus($icon, $color, $status)
->setPolicyObject($event)
- ->setHeaderIcon('fa-calendar');
+ ->setHeaderIcon($event->getIcon());
if ($is_invite_pending) {
$decline_button = id(new PHUIButtonView())
@@ -108,7 +113,6 @@
private function buildCurtain(PhabricatorCalendarEvent $event) {
$viewer = $this->getRequest()->getUser();
$id = $event->getID();
- $is_cancelled = $event->isCancelledEvent();
$is_attending = $event->getIsUserAttending($viewer->getPHID());
$can_edit = PhabricatorPolicyFilter::hasCapability(
@@ -169,7 +173,7 @@
$reinstate_label = pht('Reinstate Event');
}
- if ($is_cancelled) {
+ if ($event->isCancelledEvent()) {
$curtain->addAction(
id(new PhabricatorActionView())
->setName($reinstate_label)
@@ -302,11 +306,6 @@
$properties->invokeWillRenderEvent();
- $properties->addProperty(
- pht('Icon'),
- id(new PhabricatorCalendarIconSet())
- ->getIconLabel($event->getIcon()));
-
return $properties;
}

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 5, 2:52 AM (1 d, 20 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7654979
Default Alt Text
D16297.id39198.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility