Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15418289
D17255.id41507.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
11 KB
Referenced Files
None
Subscribers
None
D17255.id41507.diff
View Options
diff --git a/src/applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php b/src/applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php
--- a/src/applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php
+++ b/src/applications/favorites/engine/PhabricatorFavoritesProfileMenuEngine.php
@@ -7,7 +7,7 @@
return true;
}
- protected function getItemURI($path) {
+ public function getItemURI($path) {
$object = $this->getProfileObject();
$custom = $this->getCustomPHID();
diff --git a/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php b/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php
--- a/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php
+++ b/src/applications/home/engine/PhabricatorHomeProfileMenuEngine.php
@@ -7,7 +7,7 @@
return true;
}
- protected function getItemURI($path) {
+ public function getItemURI($path) {
$object = $this->getProfileObject();
$custom = $this->getCustomPHID();
diff --git a/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php b/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
--- a/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
+++ b/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
@@ -10,7 +10,7 @@
return false;
}
- protected function getItemURI($path) {
+ public function getItemURI($path) {
$user = $this->getProfileObject();
$username = $user->getUsername();
$username = phutil_escape_uri($username);
diff --git a/src/applications/project/controller/PhabricatorProjectViewController.php b/src/applications/project/controller/PhabricatorProjectViewController.php
--- a/src/applications/project/controller/PhabricatorProjectViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectViewController.php
@@ -25,9 +25,10 @@
$controller_object = new PhabricatorProjectBoardViewController();
break;
case PhabricatorProject::ITEM_PROFILE:
- default:
$controller_object = new PhabricatorProjectProfileController();
break;
+ default:
+ return $engine->buildResponse();
}
return $this->delegateToController($controller_object);
diff --git a/src/applications/project/engine/PhabricatorProjectProfileMenuEngine.php b/src/applications/project/engine/PhabricatorProjectProfileMenuEngine.php
--- a/src/applications/project/engine/PhabricatorProjectProfileMenuEngine.php
+++ b/src/applications/project/engine/PhabricatorProjectProfileMenuEngine.php
@@ -7,7 +7,7 @@
return true;
}
- protected function getItemURI($path) {
+ public function getItemURI($path) {
$project = $this->getProfileObject();
$id = $project->getID();
return "/project/{$id}/item/{$path}";
diff --git a/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php b/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php
--- a/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php
+++ b/src/applications/project/menuitem/PhabricatorProjectManageProfileMenuItem.php
@@ -18,11 +18,6 @@
return false;
}
- public function canMakeDefault(
- PhabricatorProfileMenuItemConfiguration $config) {
- return true;
- }
-
public function getDisplayName(
PhabricatorProfileMenuItemConfiguration $config) {
$name = $config->getMenuItemProperty('name');
diff --git a/src/applications/search/engine/PhabricatorProfileMenuEngine.php b/src/applications/search/engine/PhabricatorProfileMenuEngine.php
--- a/src/applications/search/engine/PhabricatorProfileMenuEngine.php
+++ b/src/applications/search/engine/PhabricatorProfileMenuEngine.php
@@ -82,7 +82,7 @@
return $this->showNavigation;
}
- abstract protected function getItemURI($path);
+ abstract public function getItemURI($path);
abstract protected function isMenuEngineConfigurable();
abstract protected function getBuiltinProfileItems($object);
@@ -102,6 +102,9 @@
$request = $controller->getRequest();
$item_action = $request->getURIData('itemAction');
+ if (!$item_action) {
+ $item_action = 'view';
+ }
// If the engine is not configurable, don't respond to any of the editing
// or configuration routes.
@@ -136,6 +139,12 @@
}
}
+ if (!$selected_item) {
+ if ($item_action == 'view') {
+ $selected_item = $this->getDefaultItem();
+ }
+ }
+
switch ($item_action) {
case 'view':
case 'info':
@@ -159,21 +168,33 @@
}
$navigation = $this->buildNavigation();
- $navigation->selectFilter('item.configure');
$crumbs = $controller->buildApplicationCrumbsForEditEngine();
- switch ($this->getMenuType()) {
- case 'personal':
- $crumbs->addTextCrumb(pht('Personal'));
- break;
- case 'global':
- $crumbs->addTextCrumb(pht('Global'));
- break;
+
+ // TODO: This stuff might need a little tweaking at some point, since it
+ // causes "Global" and "Personal" to show up in contexts where they don't
+ // make sense, notably Projects.
+ if ($item_action != 'view') {
+ $navigation->selectFilter('item.configure');
+ switch ($this->getMenuType()) {
+ case 'personal':
+ $crumbs->addTextCrumb(pht('Personal'));
+ break;
+ case 'global':
+ $crumbs->addTextCrumb(pht('Global'));
+ break;
+ }
}
switch ($item_action) {
case 'view':
+ $navigation->selectFilter($selected_item->getItemIdentifier());
+
$content = $this->buildItemViewContent($selected_item);
+ $crumbs->addTextCrumb($selected_item->getDisplayName());
+ if (!$content) {
+ return new Aphront404Response();
+ }
break;
case 'configure':
$content = $this->buildItemConfigureContent($item_list);
@@ -225,6 +246,7 @@
if ($this->getShowNavigation()) {
$page->setNavigation($navigation);
}
+
return $page;
}
@@ -269,13 +291,8 @@
if (count($items) == 1) {
$item = head($items);
if ($item->getKey() === null) {
- $builtin_key = $menu_item->getBuiltinKey();
- $item_phid = $menu_item->getPHID();
- if ($builtin_key !== null) {
- $item->setKey($builtin_key);
- } else if ($item_phid !== null) {
- $item->setKey($item_phid);
- }
+ $item_identifier = $menu_item->getItemIdentifier();
+ $item->setKey($item_identifier);
}
}
@@ -326,6 +343,7 @@
foreach ($stored_items as $stored_item) {
$impl = $stored_item->getMenuItem();
$impl->setViewer($viewer);
+ $impl->setEngine($this);
}
// Merge the stored items into the builtin items. If a builtin item has
@@ -442,6 +460,7 @@
$item = clone $item;
$item->setViewer($viewer);
+ $item->setEngine($this);
$builtin
->setProfilePHID($object->getPHID())
@@ -546,6 +565,10 @@
->setURI($this->getConfigureURI());
}
+ private function buildItemViewContent(
+ PhabricatorProfileMenuItemConfiguration $item) {
+ return $item->newPageContent();
+ }
private function buildItemConfigureContent(array $items) {
$viewer = $this->getViewer();
diff --git a/src/applications/search/menuitem/PhabricatorDashboardProfileMenuItem.php b/src/applications/search/menuitem/PhabricatorDashboardProfileMenuItem.php
--- a/src/applications/search/menuitem/PhabricatorDashboardProfileMenuItem.php
+++ b/src/applications/search/menuitem/PhabricatorDashboardProfileMenuItem.php
@@ -21,6 +21,11 @@
return true;
}
+ public function canMakeDefault(
+ PhabricatorProfileMenuItemConfiguration $config) {
+ return true;
+ }
+
public function attachDashboard($dashboard) {
$this->dashboard = $dashboard;
return $this;
@@ -28,14 +33,39 @@
public function getDashboard() {
$dashboard = $this->dashboard;
+
if (!$dashboard) {
return null;
} else if ($dashboard->isArchived()) {
return null;
}
+
return $dashboard;
}
+ public function newPageContent(
+ PhabricatorProfileMenuItemConfiguration $config) {
+ $viewer = $this->getViewer();
+
+ $dashboard_phid = $config->getMenuItemProperty('dashboardPHID');
+
+ // Reload the dashboard to attach panels, which we need for rendering.
+ $dashboard = id(new PhabricatorDashboardQuery())
+ ->setViewer($viewer)
+ ->withPHIDs(array($dashboard_phid))
+ ->needPanels(true)
+ ->executeOne();
+ if (!$dashboard) {
+ return null;
+ }
+
+ $engine = id(new PhabricatorDashboardRenderingEngine())
+ ->setViewer($viewer)
+ ->setDashboard($dashboard);
+
+ return $engine->renderDashboard();
+ }
+
public function willBuildNavigationItems(array $items) {
$viewer = $this->getViewer();
$dashboard_phids = array();
@@ -100,7 +130,7 @@
$icon = $dashboard->getIcon();
$name = $this->getDisplayName($config);
- $href = $dashboard->getViewURI();
+ $href = $this->getItemViewURI($config);
$item = $this->newItem()
->setHref($href)
diff --git a/src/applications/search/menuitem/PhabricatorProfileMenuItem.php b/src/applications/search/menuitem/PhabricatorProfileMenuItem.php
--- a/src/applications/search/menuitem/PhabricatorProfileMenuItem.php
+++ b/src/applications/search/menuitem/PhabricatorProfileMenuItem.php
@@ -3,6 +3,7 @@
abstract class PhabricatorProfileMenuItem extends Phobject {
private $viewer;
+ private $engine;
final public function buildNavigationMenuItems(
PhabricatorProfileMenuItemConfiguration $config) {
@@ -55,6 +56,15 @@
return $this->viewer;
}
+ public function setEngine(PhabricatorProfileMenuEngine $engine) {
+ $this->engine = $engine;
+ return $this;
+ }
+
+ public function getEngine() {
+ return $this->engine;
+ }
+
final public function getMenuItemKey() {
return $this->getPhobjectClassConstant('MENUITEMKEY');
}
@@ -70,6 +80,20 @@
return new PHUIListItemView();
}
+ public function newPageContent(
+ PhabricatorProfileMenuItemConfiguration $config) {
+ return null;
+ }
+
+ public function getItemViewURI(
+ PhabricatorProfileMenuItemConfiguration $config) {
+
+ $engine = $this->getEngine();
+ $key = $config->getItemIdentifier();
+
+ return $engine->getItemURI("view/{$key}/");
+ }
+
public function validateTransactions(
PhabricatorProfileMenuItemConfiguration $config,
$field_key,
diff --git a/src/applications/search/storage/PhabricatorProfileMenuItemConfiguration.php b/src/applications/search/storage/PhabricatorProfileMenuItemConfiguration.php
--- a/src/applications/search/storage/PhabricatorProfileMenuItemConfiguration.php
+++ b/src/applications/search/storage/PhabricatorProfileMenuItemConfiguration.php
@@ -185,6 +185,19 @@
return ($this->getVisibility() === self::VISIBILITY_DEFAULT);
}
+ public function getItemIdentifier() {
+ $id = $this->getID();
+
+ if ($id) {
+ return (int)$id;
+ }
+
+ return $this->getBuiltinKey();
+ }
+
+ public function newPageContent() {
+ return $this->getMenuItem()->newPageContent($this);
+ }
/* -( PhabricatorPolicyInterface )----------------------------------------- */
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Mar 21, 10:19 PM (2 w, 4 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7388444
Default Alt Text
D17255.id41507.diff (11 KB)
Attached To
Mode
D17255: Allow menu items to render their own content; make Dashboard items render on-page
Attached
Detach File
Event Timeline
Log In to Comment