Christopher Johnson (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/214433
Change subject: fixes "hamburger menu" ...................................................................... fixes "hamburger menu" Bug: T99949 Change-Id: I3c5862a364e4e37c11454d326fe549ea85f69d23 --- M src/controller/SprintController.php 1 file changed, 30 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint refs/changes/33/214433/1 diff --git a/src/controller/SprintController.php b/src/controller/SprintController.php index 5729737..ecf41af 100644 --- a/src/controller/SprintController.php +++ b/src/controller/SprintController.php @@ -24,8 +24,8 @@ } public function buildApplicationMenu() { - return $this->buildSideNavView(true, $this->getUser(), - $this->setApplicationURI())->getMenu(); + return $this->buildSideNavView(true, $this->getUser(), + $this->setApplicationURI())->getMenu(); } public function buildNavMenu() { @@ -44,20 +44,32 @@ /** * @param PhutilURI $uri */ - public function buildSideNavView($for_app = false, $user, $uri) { - + public function buildSideNavView($viewer, $uri, $for_app = false) { + $request = $this->getRequest(); + $id = $request->getURIData('id'); + $slug = $request->getURIData('slug'); + if ($slug) { + $id = $this->getProjectIDfromSlug($slug, $viewer); + } $nav = new AphrontSideNavFilterView(); $nav->setBaseURI($uri); if ($for_app) { - $nav->addFilter('create', pht('Create Task')); + if ($id) { + $nav->addFilter("profile/{$id}/", pht('Profile')); + $nav->addFilter("board/{$id}/", pht('Workboard')); + $nav->addFilter("members/{$id}/", pht('Members')); + $nav->addFilter("feed/{$id}/", pht('Feed')); + $nav->addFilter("details/{$id}/", pht('Edit Details')); + } + $nav->addFilter('create', pht('Create Project')); } - id(new ManiphestTaskSearchEngine()) - ->setViewer($user) + id(new PhabricatorProjectSearchEngine()) + ->setViewer($viewer) ->addNavigationItems($nav->getMenu()); - if ($user->isLoggedIn()) { + if ($viewer->isLoggedIn()) { $nav->addLabel(pht('Reports')); $nav->addFilter('report', pht('Reports')); } @@ -96,6 +108,16 @@ return $view; } + public function getProjectIDfromSlug($slug, $viewer) { + $project = id(new PhabricatorProjectQuery()) + ->setViewer($viewer) + ->withSlugs(array($slug)) + ->needImages(true) + ->executeOne(); + $id = $project->getID(); + return $id; + } + public function buildIconNavView(PhabricatorProject $project) { $nav = $this->buildSprintIconNavView($project); $nav->selectFilter(null); -- To view, visit https://gerrit.wikimedia.org/r/214433 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c5862a364e4e37c11454d326fe549ea85f69d23 Gerrit-PatchSet: 1 Gerrit-Project: phabricator/extensions/Sprint Gerrit-Branch: master Gerrit-Owner: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits