diff --git a/src/applications/dashboard/controller/PhabricatorDashboardListController.php b/src/applications/dashboard/controller/PhabricatorDashboardListController.php index 0f9b7ba7d6..8a01722bbb 100644 --- a/src/applications/dashboard/controller/PhabricatorDashboardListController.php +++ b/src/applications/dashboard/controller/PhabricatorDashboardListController.php @@ -1,73 +1,51 @@ queryKey = idx($data, 'queryKey'); } public function processRequest() { $request = $this->getRequest(); $controller = id(new PhabricatorApplicationSearchController($request)) ->setQueryKey($this->queryKey) ->setSearchEngine(new PhabricatorDashboardSearchEngine()) ->setNavigation($this->buildSideNavView()); return $this->delegateToController($controller); } public function buildSideNavView() { $user = $this->getRequest()->getUser(); $nav = new AphrontSideNavFilterView(); $nav->setBaseURI(new PhutilURI($this->getApplicationURI())); id(new PhabricatorDashboardSearchEngine()) ->setViewer($user) ->addNavigationItems($nav->getMenu()); $nav->addLabel(pht('Panels')); $nav->addFilter('panel/', pht('Manage Panels')); $nav->selectFilter(null); return $nav; } public function buildApplicationCrumbs() { $crumbs = parent::buildApplicationCrumbs(); $crumbs->addAction( id(new PHUIListItemView()) ->setIcon('create') ->setName(pht('Create Dashboard')) ->setHref($this->getApplicationURI().'create/')); return $crumbs; } - public function renderResultsList( - array $dashboards, - PhabricatorSavedQuery $query) { - $viewer = $this->getRequest()->getUser(); - - $list = new PHUIObjectItemListView(); - $list->setUser($viewer); - foreach ($dashboards as $dashboard) { - $id = $dashboard->getID(); - - $item = id(new PHUIObjectItemView()) - ->setObjectName(pht('Dashboard %d', $id)) - ->setHeader($dashboard->getName()) - ->setHref($this->getApplicationURI("view/{$id}/")) - ->setObject($dashboard); - - $list->addItem($item); - } - - return $list; - } - } diff --git a/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php b/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php index 961a7e5f57..730425d9ed 100644 --- a/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php +++ b/src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php @@ -1,49 +1,78 @@ pht('All Dashboards'), ); return $names; } public function buildSavedQueryFromBuiltin($query_key) { $query = $this->newSavedQuery(); $query->setQueryKey($query_key); switch ($query_key) { case 'all': return $query; } return parent::buildSavedQueryFromBuiltin($query_key); } + + protected function renderResultList( + array $dashboards, + PhabricatorSavedQuery $query, + array $handles) { + + $viewer = $this->requireViewer(); + + $list = new PHUIObjectItemListView(); + $list->setUser($viewer); + foreach ($dashboards as $dashboard) { + $id = $dashboard->getID(); + + $item = id(new PHUIObjectItemView()) + ->setObjectName(pht('Dashboard %d', $id)) + ->setHeader($dashboard->getName()) + ->setHref($this->getApplicationURI("view/{$id}/")) + ->setObject($dashboard); + + $list->addItem($item); + } + + return $list; + } + }