Page MenuHomePhabricator
Files F15438041

D13068.diff
No OneTemporary
Actions

D13068.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
@@ -218,7 +218,12 @@
if ($event->getIsRecurring()) {
$properties->addProperty(
pht('Recurs'),
- idx($event->getRecurrenceFrequency(), 'rule'));
+ ucwords(idx($event->getRecurrenceFrequency(), 'rule')));
+ if ($event->getIsGhostEvent()) {
+ $properties->addProperty(
+ pht('Recurrence of Event'),
+ $viewer->renderHandle($event->getInstanceOfEventPHID()));
+ }
}
$properties->addProperty(
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
@@ -288,8 +288,8 @@
->setIsGhostEvent(true)
->setDateFrom($date)
->setDateTo($date + $duration)
- ->setIsRecurring(false)
- ->setRecurrenceFrequency(null)
+ ->setIsRecurring(true)
+ ->setRecurrenceFrequency($this->recurrenceFrequency)
->setInstanceOfEventPHID($this->getPHID())
->setSequenceIndex($sequence_index)
->setEditPolicy($edit_policy);
diff --git a/src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php b/src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php
--- a/src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php
+++ b/src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php
@@ -393,8 +393,6 @@
$added = array();
$uninvited = array();
- // $event = $this->renderHandleLink($object_phid);
-
foreach ($new as $phid => $status) {
if ($status == PhabricatorCalendarEventInvitee::STATUS_INVITED
|| $status == PhabricatorCalendarEventInvitee::STATUS_ATTENDING) {

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 26, 10:55 PM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7319208
Default Alt Text
D13068.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility