Page MenuHomePhabricator
Files F15413060

D20352.diff
No OneTemporary
Actions

D20352.diff
View Options

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
@@ -28,7 +28,7 @@
$default_key = PhabricatorProject::ITEM_MANAGE;
}
- switch ($default->getBuiltinKey()) {
+ switch ($default_key) {
case PhabricatorProject::ITEM_WORKBOARD:
$controller_object = new PhabricatorProjectBoardViewController();
break;
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
@@ -6,7 +6,6 @@
private $profileObject;
private $customPHID;
private $items;
- private $defaultItem;
private $controller;
private $navigation;
private $showNavigation = true;
@@ -79,8 +78,7 @@
}
public function getDefaultItem() {
- $this->getItems();
- return $this->defaultItem;
+ return $this->pickDefaultItem($this->getItems());
}
public function setShowNavigation($show) {
@@ -154,30 +152,10 @@
$item_list = $this->getItems();
- $selected_item = null;
- if (strlen($item_id)) {
- $item_id_int = (int)$item_id;
- foreach ($item_list as $item) {
- if ($item_id_int) {
- if ((int)$item->getID() === $item_id_int) {
- $selected_item = $item;
- break;
- }
- }
-
- $builtin_key = $item->getBuiltinKey();
- if ($builtin_key === (string)$item_id) {
- $selected_item = $item;
- break;
- }
- }
- }
-
- if (!$selected_item) {
- if ($is_view) {
- $selected_item = $this->getDefaultItem();
- }
- }
+ $selected_item = $this->pickSelectedItem(
+ $item_list,
+ $item_id,
+ $is_view);
switch ($item_action) {
case 'view':
@@ -485,39 +463,7 @@
}
}
- $items = $this->arrangeItems($items, $mode);
-
- // Make sure exactly one valid item is marked as default.
- $default = null;
- $first = null;
- foreach ($items as $item) {
- if (!$item->canMakeDefault() || $item->isDisabled()) {
- continue;
- }
-
- // If this engine doesn't support pinning items, don't respect any
- // setting which might be present in the database.
- if ($this->isMenuEnginePinnable()) {
- if ($item->isDefault()) {
- $default = $item;
- break;
- }
- }
-
- if ($first === null) {
- $first = $item;
- }
- }
-
- if (!$default) {
- $default = $first;
- }
-
- if ($default) {
- $this->setDefaultItem($default);
- }
-
- return $items;
+ return $this->arrangeItems($items, $mode);
}
private function loadBuiltinProfileItems($mode) {
@@ -1361,4 +1307,64 @@
pht('There are no menu items.'));
}
+ private function pickDefaultItem(array $items) {
+ // Remove all the items which can not be the default item.
+ foreach ($items as $key => $item) {
+ if (!$item->canMakeDefault()) {
+ unset($items[$key]);
+ continue;
+ }
+
+ if ($item->isDisabled()) {
+ unset($items[$key]);
+ continue;
+ }
+ }
+
+ // If this engine supports pinning items and a valid item is pinned,
+ // pick that item as the default.
+ if ($this->isMenuEnginePinnable()) {
+ foreach ($items as $key => $item) {
+ if ($item->isDefault()) {
+ return $item;
+ }
+ }
+ }
+
+ // If we have some other valid items, pick the first one as the default.
+ if ($items) {
+ return head($items);
+ }
+
+ return null;
+ }
+
+ private function pickSelectedItem(array $items, $item_id, $is_view) {
+ if (strlen($item_id)) {
+ $item_id_int = (int)$item_id;
+ foreach ($items as $item) {
+ if ($item_id_int) {
+ if ((int)$item->getID() === $item_id_int) {
+ return $item;
+ }
+ }
+
+ $builtin_key = $item->getBuiltinKey();
+ if ($builtin_key === (string)$item_id) {
+ return $item;
+ }
+ }
+
+ // Nothing matches the selected item ID, so we don't have a valid
+ // selection.
+ return null;
+ }
+
+ if ($is_view) {
+ return $this->pickDefaultItem($items);
+ }
+
+ return null;
+ }
+
}

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 20, 4:51 PM (4 d, 1 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7288686
Default Alt Text
D20352.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility