Page MenuHomePhabricator
Files F13996192

D16779.id40417.diff
No OneTemporary
Actions

D16779.id40417.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
@@ -101,7 +101,7 @@
$viewer = $this->getViewer();
$id = $event->getID();
- if ($event->isCancelledEvent()) {
+ if ($event->getIsCancelled()) {
$icon = 'fa-ban';
$color = 'red';
$status = pht('Cancelled');
@@ -209,7 +209,7 @@
$cancel_label = pht('Cancel Event');
$reinstate_label = pht('Reinstate Event');
- if ($event->isCancelledEvent()) {
+ if ($event->getIsCancelled()) {
$curtain->addAction(
id(new PhabricatorActionView())
->setName($reinstate_label)
diff --git a/src/applications/calendar/phid/PhabricatorCalendarEventPHIDType.php b/src/applications/calendar/phid/PhabricatorCalendarEventPHIDType.php
--- a/src/applications/calendar/phid/PhabricatorCalendarEventPHIDType.php
+++ b/src/applications/calendar/phid/PhabricatorCalendarEventPHIDType.php
@@ -41,7 +41,7 @@
->setFullName(pht('%s: %s', $monogram, $name))
->setURI($uri);
- if ($event->isCancelledEvent()) {
+ if ($event->getIsCancelled()) {
$handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
}
}
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
@@ -303,7 +303,7 @@
$item->addAttribute($event->renderEventDate($viewer, false));
- if ($event->isCancelledEvent()) {
+ if ($event->getIsCancelled()) {
$item->setDisabled(true);
}
@@ -368,7 +368,7 @@
$event_view = id(new AphrontCalendarEventView())
->setHostPHID($event->getHostPHID())
->setEpochRange($epoch_min, $epoch_max)
- ->setIsCancelled($event->isCancelledEvent())
+ ->setIsCancelled($event->getIsCancelled())
->setName($event->getName())
->setURI($event->getURI())
->setIsAllDay($event->getIsAllDay())
@@ -441,7 +441,7 @@
->setIconColor($status_color)
->setName($event->getName())
->setURI($event->getURI())
- ->setIsCancelled($event->isCancelledEvent());
+ ->setIsCancelled($event->getIsCancelled());
$day_view->addEvent($event_view);
}
diff --git a/src/applications/calendar/storage/PhabricatorCalendarEvent.php b/src/applications/calendar/storage/PhabricatorCalendarEvent.php
--- a/src/applications/calendar/storage/PhabricatorCalendarEvent.php
+++ b/src/applications/calendar/storage/PhabricatorCalendarEvent.php
@@ -584,11 +584,6 @@
return ($this->instanceOfEventPHID !== null);
}
- public function isCancelledEvent() {
- // TODO: Remove this wrapper.
- return $this->getIsCancelled();
- }
-
public function renderEventDate(
PhabricatorUser $viewer,
$show_end) {
@@ -641,7 +636,7 @@
public function getDisplayIcon(PhabricatorUser $viewer) {
- if ($this->isCancelledEvent()) {
+ if ($this->getIsCancelled()) {
return 'fa-times';
}
@@ -665,7 +660,7 @@
}
public function getDisplayIconColor(PhabricatorUser $viewer) {
- if ($this->isCancelledEvent()) {
+ if ($this->getIsCancelled()) {
return 'red';
}
@@ -689,7 +684,7 @@
}
public function getDisplayIconLabel(PhabricatorUser $viewer) {
- if ($this->isCancelledEvent()) {
+ if ($this->getIsCancelled()) {
return pht('Cancelled');
}

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 24, 6:51 PM (3 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6708668
Default Alt Text
D16779.id40417.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility