@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Ghost events should provide a link to original event

Summary: Closes T8356, Ghost events should provide a link to original event

Test Plan: Open an instance at /calendar/event/{id}/{index}. It should have a link to /calendar/event/{id}. Original recurring event should not link to itself.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin, epriestley

Maniphest Tasks: T8356

Differential Revision: https://secure.phabricator.com/D13068

+8 -5
+6 -1
src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
··· 218 218 if ($event->getIsRecurring()) { 219 219 $properties->addProperty( 220 220 pht('Recurs'), 221 - idx($event->getRecurrenceFrequency(), 'rule')); 221 + ucwords(idx($event->getRecurrenceFrequency(), 'rule'))); 222 + if ($event->getIsGhostEvent()) { 223 + $properties->addProperty( 224 + pht('Recurrence of Event'), 225 + $viewer->renderHandle($event->getInstanceOfEventPHID())); 226 + } 222 227 } 223 228 224 229 $properties->addProperty(
+2 -2
src/applications/calendar/storage/PhabricatorCalendarEvent.php
··· 288 288 ->setIsGhostEvent(true) 289 289 ->setDateFrom($date) 290 290 ->setDateTo($date + $duration) 291 - ->setIsRecurring(false) 292 - ->setRecurrenceFrequency(null) 291 + ->setIsRecurring(true) 292 + ->setRecurrenceFrequency($this->recurrenceFrequency) 293 293 ->setInstanceOfEventPHID($this->getPHID()) 294 294 ->setSequenceIndex($sequence_index) 295 295 ->setEditPolicy($edit_policy);
-2
src/applications/calendar/storage/PhabricatorCalendarEventTransaction.php
··· 393 393 $added = array(); 394 394 $uninvited = array(); 395 395 396 - // $event = $this->renderHandleLink($object_phid); 397 - 398 396 foreach ($new as $phid => $status) { 399 397 if ($status == PhabricatorCalendarEventInvitee::STATUS_INVITED 400 398 || $status == PhabricatorCalendarEventInvitee::STATUS_ATTENDING) {