From 5ca007044659c5c822a4dd64dd0f2de3e2c82330 Mon Sep 17 00:00:00 2001
From: lkassianik <lyubakassianik@gmail.com>
Date: Thu, 30 Apr 2015 16:18:15 -0700
Subject: [PATCH] Left nav should no longer offer to create Calendar event and
 create event page should no longer show left nav.

Summary: Closes T7934, Left nav should no longer offer to create Calendar event and create event page should no longer show left nav.

Test Plan: Open Calendar, left nav should be missing the Create Event option, create event, create view should no longer show left nav.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin, epriestley

Maniphest Tasks: T7934

Differential Revision: https://secure.phabricator.com/D12638
---
 .../controller/PhabricatorCalendarController.php    |  1 -
 .../PhabricatorCalendarEventEditController.php      | 13 ++-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/applications/calendar/controller/PhabricatorCalendarController.php b/src/applications/calendar/controller/PhabricatorCalendarController.php
index 49eab46623..1340196240 100644
--- a/src/applications/calendar/controller/PhabricatorCalendarController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarController.php
@@ -10,7 +10,6 @@ abstract class PhabricatorCalendarController extends PhabricatorController {
     $nav->addLabel(pht('Calendar'));
     $nav->addFilter('/', pht('My Events'));
     $nav->addFilter('all/', pht('View All'));
-    $nav->addFilter('event/create/', pht('Create Event'));
 
     if ($status && $status->getID()) {
       $nav->addFilter('event/edit/'.$status->getID().'/', pht('Edit Event'));
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
index 238c96039e..a258af5893 100644
--- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
@@ -37,7 +37,6 @@ final class PhabricatorCalendarEventEditController
       $end_value = $end_time->readValueFromRequest($request);
       $start_value = $start_time->readValueFromRequest($request);
       $submit_label = pht('Create');
-      $filter = 'event/create/';
       $page_title = pht('Create Event');
       $redirect = 'created';
       $subscribers = array();
@@ -59,9 +58,7 @@ final class PhabricatorCalendarEventEditController
       $end_time->setValue($event->getDateTo());
       $start_time->setValue($event->getDateFrom());
       $submit_label = pht('Update');
-      $filter       = 'event/edit/'.$event->getID().'/';
       $page_title   = pht('Update Event');
-      $redirect     = 'updated';
 
       $subscribers = PhabricatorSubscribersQuery::loadSubscribersForPHID(
         $event->getPHID());
@@ -245,9 +242,6 @@ final class PhabricatorCalendarEventEditController
       ->setFormErrors($errors)
       ->setForm($form);
 
-    $nav = $this->buildSideNavView($event);
-    $nav->selectFilter($filter);
-
     $crumbs = $this->buildApplicationCrumbs();
 
     if (!$this->isCreate()) {
@@ -261,14 +255,11 @@ final class PhabricatorCalendarEventEditController
       ->setValidationException($validation_exception)
       ->appendChild($form);
 
-    $nav->appendChild(
+    return $this->buildApplicationPage(
       array(
         $crumbs,
         $object_box,
-      ));
-
-    return $this->buildApplicationPage(
-      $nav,
+        ),
       array(
         'title' => $page_title,
       ));
-- 
2.54.0