diff --git a/src/applications/project/controller/PhabricatorProjectBoardController.php b/src/applications/project/controller/PhabricatorProjectBoardController.php index ef2e09f8f1..0837f9f5b7 100644 --- a/src/applications/project/controller/PhabricatorProjectBoardController.php +++ b/src/applications/project/controller/PhabricatorProjectBoardController.php @@ -3,16 +3,6 @@ abstract class PhabricatorProjectBoardController extends PhabricatorProjectController { - private $project; - - protected function setProject(PhabricatorProject $project) { - $this->project = $project; - return $this; - } - protected function getProject() { - return $this->project; - } - public function buildIconNavView(PhabricatorProject $project) { $id = $project->getID(); $nav = parent::buildIconNavView($project); diff --git a/src/applications/project/controller/PhabricatorProjectController.php b/src/applications/project/controller/PhabricatorProjectController.php index 4955f7fe3f..6b9b40d475 100644 --- a/src/applications/project/controller/PhabricatorProjectController.php +++ b/src/applications/project/controller/PhabricatorProjectController.php @@ -2,20 +2,32 @@ abstract class PhabricatorProjectController extends PhabricatorController { + private $project; + + protected function setProject(PhabricatorProject $project) { + $this->project = $project; + return $this; + } + + protected function getProject() { + return $this->project; + } + public function buildApplicationMenu() { return $this->buildSideNavView(true)->getMenu(); } public function buildSideNavView($for_app = false) { - $viewer = $this->getViewer(); + $project = $this->getProject(); $nav = new AphrontSideNavFilterView(); $nav->setBaseURI(new PhutilURI($this->getApplicationURI())); - $id = null; + $viewer = $this->getViewer(); + if ($for_app) { - $id = $this->getRequest()->getURIData('id'); - if ($id) { + if ($project) { + $id = $project->getID(); $nav->addFilter("profile/{$id}/", pht('Profile')); $nav->addFilter("board/{$id}/", pht('Workboard')); $nav->addFilter("members/{$id}/", pht('Members')); @@ -37,6 +49,7 @@ abstract class PhabricatorProjectController extends PhabricatorController { } public function buildIconNavView(PhabricatorProject $project) { + $this->setProject($project); $viewer = $this->getViewer(); $id = $project->getID(); $picture = $project->getProfileImageURI();