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 @@ -34,6 +34,7 @@ public function getRoutes() { return array( + '/E(?P[1-9]\d*)' => 'PhabricatorCalendarEventViewController', '/calendar/' => array( '' => 'PhabricatorCalendarViewController', 'all/' => 'PhabricatorCalendarBrowseController', @@ -46,8 +47,6 @@ => 'PhabricatorCalendarEventEditController', 'delete/(?P[1-9]\d*)/' => 'PhabricatorCalendarEventDeleteController', - 'view/(?P[1-9]\d*)/' - => 'PhabricatorCalendarEventViewController', ), ), ); diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php --- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php @@ -163,8 +163,7 @@ if ($this->isCreate()) { $submit->addCancelButton($this->getApplicationURI()); } else { - $submit->addCancelButton( - $this->getApplicationURI('event/view/'.$status->getID().'/')); + $submit->addCancelButton('/E'.$status->getID()); } if ($request->isAjax()) { diff --git a/src/view/phui/calendar/PHUICalendarListView.php b/src/view/phui/calendar/PHUICalendarListView.php --- a/src/view/phui/calendar/PHUICalendarListView.php +++ b/src/view/phui/calendar/PHUICalendarListView.php @@ -117,7 +117,7 @@ array( 'sigil' => 'has-tooltip', 'class' => 'phui-calendar-item-link', - 'href' => '/calendar/event/view/'.$event->getEventID().'/', + 'href' => '/E'.$event->getEventID(), 'meta' => array( 'tip' => $tip, 'size' => 200,