Page MenuHomePhabricator
Files F13989135

D13481.id32638.diff
No OneTemporary
Actions

D13481.id32638.diff
View Options

diff --git a/src/applications/calendar/application/PhabricatorCalendarApplication.php b/src/applications/calendar/application/PhabricatorCalendarApplication.php
--- a/src/applications/calendar/application/PhabricatorCalendarApplication.php
+++ b/src/applications/calendar/application/PhabricatorCalendarApplication.php
@@ -61,7 +61,7 @@
=> 'PhabricatorCalendarEventCancelController',
'(?P<action>join|decline|accept)/(?P<id>[1-9]\d*)/'
=> 'PhabricatorCalendarEventJoinController',
- 'comment/(?P<id>[1-9]\d*)/'
+ 'comment/(?P<id>[1-9]\d*)/(?:(?P<sequence>\d+)/)?'
=> 'PhabricatorCalendarEventCommentController',
),
),
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php b/src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
@@ -11,12 +11,14 @@
}
public function handleRequest(AphrontRequest $request) {
- $user = $request->getUser();
-
if (!$request->isFormPost()) {
return new Aphront400Response();
}
+ $user = $request->getUser();
+ $is_preview = $request->isPreviewRequest();
+ $draft = PhabricatorDraft::buildFromRequest($request);
+
$event = id(new PhabricatorCalendarEventQuery())
->setViewer($user)
->withIDs(array($this->id))
@@ -25,8 +27,23 @@
return new Aphront404Response();
}
- $is_preview = $request->isPreviewRequest();
- $draft = PhabricatorDraft::buildFromRequest($request);
+ $index = $request->getURIData('sequence');
+ if ($index && !$is_preview) {
+ $result = $this->getEventAtIndexForGhostPHID(
+ $user,
+ $event->getPHID(),
+ $index);
+
+ if ($result) {
+ $event = $result;
+ } else {
+ $event = $this->createEventFromGhost(
+ $user,
+ $event,
+ $index);
+ $event->applyViewerTimezone($user);
+ }
+ }
$view_uri = '/'.$event->getMonogram();
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
@@ -16,9 +16,10 @@
public function processRequest() {
$request = $this->getRequest();
$viewer = $request->getUser();
-
$sequence = $request->getURIData('sequence');
+ $timeline = null;
+
$event = id(new PhabricatorCalendarEventQuery())
->setViewer($viewer)
->withIDs(array($this->id))
@@ -60,9 +61,11 @@
$crumbs->addTextCrumb($title, '/E'.$event->getID());
}
- $timeline = $this->buildTransactionTimeline(
- $event,
- new PhabricatorCalendarEventTransactionQuery());
+ if (!$event->getIsGhostEvent()) {
+ $timeline = $this->buildTransactionTimeline(
+ $event,
+ new PhabricatorCalendarEventTransactionQuery());
+ }
$header = $this->buildHeaderView($event);
$actions = $this->buildActionView($event);
@@ -78,13 +81,19 @@
? pht('Add Comment')
: pht('Add To Plate');
$draft = PhabricatorDraft::newFromUserAndKey($viewer, $event->getPHID());
+ if ($sequence) {
+ $comment_uri = $this->getApplicationURI(
+ '/event/comment/'.$event->getID().'/'.$sequence.'/');
+ } else {
+ $comment_uri = $this->getApplicationURI(
+ '/event/comment/'.$event->getID().'/');
+ }
$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
->setUser($viewer)
->setObjectPHID($event->getPHID())
->setDraft($draft)
->setHeaderText($add_comment_header)
- ->setAction(
- $this->getApplicationURI('/event/comment/'.$event->getID().'/'))
+ ->setAction($comment_uri)
->setSubmitButtonName(pht('Add Comment'));
return $this->buildApplicationPage(

File Metadata

Mime Type
text/plain
Expires
Tue, Oct 22, 6:20 PM (4 w, 12 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6729566
Default Alt Text
D13481.id32638.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility