diff --git a/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php b/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php index 63d8726857..9afb836b94 100644 --- a/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php +++ b/src/applications/favorites/engineextension/PhabricatorFavoritesMainMenuBarExtension.php @@ -1,88 +1,84 @@ getViewer(); $dropdown = $this->newDropdown($viewer); if (!$dropdown) { return null; } $favorites_menu = id(new PHUIButtonView()) ->setTag('a') ->setHref('#') ->setIcon('fa-star') ->addClass('phabricator-core-user-menu') ->setNoCSS(true) ->setDropdown(true) ->setDropdownMenu($dropdown); return array( $favorites_menu, ); } private function newDropdown(PhabricatorUser $viewer) { $applications = id(new PhabricatorApplicationQuery()) ->setViewer($viewer) ->withClasses(array('PhabricatorFavoritesApplication')) ->withInstalled(true) ->execute(); $favorites = head($applications); if (!$favorites) { return null; } $menu_engine = id(new PhabricatorFavoritesProfileMenuEngine()) ->setViewer($viewer) ->setProfileObject($favorites) ->setCustomPHID($viewer->getPHID()); $filter_view = $menu_engine->buildNavigation(); $menu_view = $filter_view->getMenu(); $item_views = $menu_view->getItems(); $view = id(new PhabricatorActionListView()) ->setViewer($viewer); foreach ($item_views as $item) { - $type = null; - if (!strlen($item->getName())) { - $type = PhabricatorActionView::TYPE_DIVIDER; - } $action = id(new PhabricatorActionView()) ->setName($item->getName()) ->setHref($item->getHref()) - ->setType($type); + ->setType($item->getType()); $view->addAction($action); } if ($viewer->isLoggedIn()) { $view->addAction( id(new PhabricatorActionView()) ->setType(PhabricatorActionView::TYPE_DIVIDER)); $view->addAction( id(new PhabricatorActionView()) ->setName(pht('Edit Favorites')) ->setHref('/favorites/menu/configure/')); } return $view; } } diff --git a/src/applications/search/menuitem/PhabricatorDividerProfileMenuItem.php b/src/applications/search/menuitem/PhabricatorDividerProfileMenuItem.php index 255e0d4b72..e6a6e608e6 100644 --- a/src/applications/search/menuitem/PhabricatorDividerProfileMenuItem.php +++ b/src/applications/search/menuitem/PhabricatorDividerProfileMenuItem.php @@ -1,48 +1,49 @@ setValue( pht( 'This is a visual divider which you can use to separate '. 'sections in the menu. It does not have any configurable '. 'options.')), ); } protected function newNavigationMenuItems( PhabricatorProfileMenuItemConfiguration $config) { $item = $this->newItem() + ->setType(PHUIListItemView::TYPE_DIVIDER) ->addClass('phui-divider'); return array( $item, ); } }