Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14006280
D17025.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
17 KB
Referenced Files
None
Subscribers
None
D17025.diff
View Options
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -3265,7 +3265,7 @@
'PhabricatorPeopleProfileController' => 'applications/people/controller/PhabricatorPeopleProfileController.php',
'PhabricatorPeopleProfileEditController' => 'applications/people/controller/PhabricatorPeopleProfileEditController.php',
'PhabricatorPeopleProfileManageController' => 'applications/people/controller/PhabricatorPeopleProfileManageController.php',
- 'PhabricatorPeopleProfilePanelEngine' => 'applications/people/engine/PhabricatorPeopleProfilePanelEngine.php',
+ 'PhabricatorPeopleProfileMenuEngine' => 'applications/people/engine/PhabricatorPeopleProfileMenuEngine.php',
'PhabricatorPeopleProfilePictureController' => 'applications/people/controller/PhabricatorPeopleProfilePictureController.php',
'PhabricatorPeopleProfileViewController' => 'applications/people/controller/PhabricatorPeopleProfileViewController.php',
'PhabricatorPeopleQuery' => 'applications/people/query/PhabricatorPeopleQuery.php',
@@ -3364,6 +3364,7 @@
'PhabricatorPolicyType' => 'applications/policy/constants/PhabricatorPolicyType.php',
'PhabricatorPonderApplication' => 'applications/ponder/application/PhabricatorPonderApplication.php',
'PhabricatorProfileMenuCollapsedSetting' => 'applications/settings/setting/PhabricatorProfileMenuCollapsedSetting.php',
+ 'PhabricatorProfileMenuEngine' => 'applications/search/engine/PhabricatorProfileMenuEngine.php',
'PhabricatorProfilePanel' => 'applications/search/profilepanel/PhabricatorProfilePanel.php',
'PhabricatorProfilePanelConfiguration' => 'applications/search/storage/PhabricatorProfilePanelConfiguration.php',
'PhabricatorProfilePanelConfigurationQuery' => 'applications/search/query/PhabricatorProfilePanelConfigurationQuery.php',
@@ -3371,7 +3372,6 @@
'PhabricatorProfilePanelConfigurationTransactionQuery' => 'applications/search/query/PhabricatorProfilePanelConfigurationTransactionQuery.php',
'PhabricatorProfilePanelEditEngine' => 'applications/search/editor/PhabricatorProfilePanelEditEngine.php',
'PhabricatorProfilePanelEditor' => 'applications/search/editor/PhabricatorProfilePanelEditor.php',
- 'PhabricatorProfilePanelEngine' => 'applications/search/engine/PhabricatorProfilePanelEngine.php',
'PhabricatorProfilePanelIconSet' => 'applications/search/profilepanel/PhabricatorProfilePanelIconSet.php',
'PhabricatorProfilePanelPHIDType' => 'applications/search/phidtype/PhabricatorProfilePanelPHIDType.php',
'PhabricatorProject' => 'applications/project/storage/PhabricatorProject.php',
@@ -3452,7 +3452,7 @@
'PhabricatorProjectPanelController' => 'applications/project/controller/PhabricatorProjectPanelController.php',
'PhabricatorProjectPointsProfilePanel' => 'applications/project/profilepanel/PhabricatorProjectPointsProfilePanel.php',
'PhabricatorProjectProfileController' => 'applications/project/controller/PhabricatorProjectProfileController.php',
- 'PhabricatorProjectProfilePanelEngine' => 'applications/project/engine/PhabricatorProjectProfilePanelEngine.php',
+ 'PhabricatorProjectProfileMenuEngine' => 'applications/project/engine/PhabricatorProjectProfileMenuEngine.php',
'PhabricatorProjectProjectHasMemberEdgeType' => 'applications/project/edge/PhabricatorProjectProjectHasMemberEdgeType.php',
'PhabricatorProjectProjectHasObjectEdgeType' => 'applications/project/edge/PhabricatorProjectProjectHasObjectEdgeType.php',
'PhabricatorProjectProjectPHIDType' => 'applications/project/phid/PhabricatorProjectProjectPHIDType.php',
@@ -8331,7 +8331,7 @@
'PhabricatorPeopleProfileController' => 'PhabricatorPeopleController',
'PhabricatorPeopleProfileEditController' => 'PhabricatorPeopleProfileController',
'PhabricatorPeopleProfileManageController' => 'PhabricatorPeopleProfileController',
- 'PhabricatorPeopleProfilePanelEngine' => 'PhabricatorProfilePanelEngine',
+ 'PhabricatorPeopleProfileMenuEngine' => 'PhabricatorProfileMenuEngine',
'PhabricatorPeopleProfilePictureController' => 'PhabricatorPeopleProfileController',
'PhabricatorPeopleProfileViewController' => 'PhabricatorPeopleProfileController',
'PhabricatorPeopleQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
@@ -8450,6 +8450,7 @@
'PhabricatorPolicyType' => 'PhabricatorPolicyConstants',
'PhabricatorPonderApplication' => 'PhabricatorApplication',
'PhabricatorProfileMenuCollapsedSetting' => 'PhabricatorInternalSetting',
+ 'PhabricatorProfileMenuEngine' => 'Phobject',
'PhabricatorProfilePanel' => 'Phobject',
'PhabricatorProfilePanelConfiguration' => array(
'PhabricatorSearchDAO',
@@ -8462,7 +8463,6 @@
'PhabricatorProfilePanelConfigurationTransactionQuery' => 'PhabricatorApplicationTransactionQuery',
'PhabricatorProfilePanelEditEngine' => 'PhabricatorEditEngine',
'PhabricatorProfilePanelEditor' => 'PhabricatorApplicationTransactionEditor',
- 'PhabricatorProfilePanelEngine' => 'Phobject',
'PhabricatorProfilePanelIconSet' => 'PhabricatorIconSet',
'PhabricatorProfilePanelPHIDType' => 'PhabricatorPHIDType',
'PhabricatorProject' => array(
@@ -8565,7 +8565,7 @@
'PhabricatorProjectPanelController' => 'PhabricatorProjectController',
'PhabricatorProjectPointsProfilePanel' => 'PhabricatorProfilePanel',
'PhabricatorProjectProfileController' => 'PhabricatorProjectController',
- 'PhabricatorProjectProfilePanelEngine' => 'PhabricatorProfilePanelEngine',
+ 'PhabricatorProjectProfileMenuEngine' => 'PhabricatorProfileMenuEngine',
'PhabricatorProjectProjectHasMemberEdgeType' => 'PhabricatorEdgeType',
'PhabricatorProjectProjectHasObjectEdgeType' => 'PhabricatorEdgeType',
'PhabricatorProjectProjectPHIDType' => 'PhabricatorPHIDType',
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfileController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php
@@ -36,7 +36,7 @@
if ($user) {
$viewer = $this->getViewer();
- $engine = id(new PhabricatorPeopleProfilePanelEngine())
+ $engine = id(new PhabricatorPeopleProfileMenuEngine())
->setViewer($viewer)
->setProfileObject($user);
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php
@@ -85,7 +85,7 @@
$crumbs->setBorder(true);
$nav = $this->getProfileMenu();
- $nav->selectFilter(PhabricatorPeopleProfilePanelEngine::PANEL_MANAGE);
+ $nav->selectFilter(PhabricatorPeopleProfileMenuEngine::PANEL_MANAGE);
$header = id(new PHUIHeaderView())
->setHeader(pht('Edit Profile: %s', $user->getFullName()))
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileManageController.php b/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
@@ -43,7 +43,7 @@
$name = $user->getUsername();
$nav = $this->getProfileMenu();
- $nav->selectFilter(PhabricatorPeopleProfilePanelEngine::PANEL_MANAGE);
+ $nav->selectFilter(PhabricatorPeopleProfileMenuEngine::PANEL_MANAGE);
$timeline = $this->buildTransactionTimeline(
$user,
diff --git a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php
@@ -256,7 +256,7 @@
$crumbs->setBorder(true);
$nav = $this->getProfileMenu();
- $nav->selectFilter(PhabricatorPeopleProfilePanelEngine::PANEL_MANAGE);
+ $nav->selectFilter(PhabricatorPeopleProfileMenuEngine::PANEL_MANAGE);
$header = id(new PHUIHeaderView())
->setHeader(pht('Edit Profile Picture'))
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
@@ -78,7 +78,7 @@
));
$nav = $this->getProfileMenu();
- $nav->selectFilter(PhabricatorPeopleProfilePanelEngine::PANEL_PROFILE);
+ $nav->selectFilter(PhabricatorPeopleProfileMenuEngine::PANEL_PROFILE);
$crumbs = $this->buildApplicationCrumbs();
$crumbs->setBorder(true);
diff --git a/src/applications/people/engine/PhabricatorPeopleProfilePanelEngine.php b/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
rename from src/applications/people/engine/PhabricatorPeopleProfilePanelEngine.php
rename to src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
--- a/src/applications/people/engine/PhabricatorPeopleProfilePanelEngine.php
+++ b/src/applications/people/engine/PhabricatorPeopleProfileMenuEngine.php
@@ -1,12 +1,12 @@
<?php
-final class PhabricatorPeopleProfilePanelEngine
- extends PhabricatorProfilePanelEngine {
+final class PhabricatorPeopleProfileMenuEngine
+ extends PhabricatorProfileMenuEngine {
const PANEL_PROFILE = 'people.profile';
const PANEL_MANAGE = 'people.manage';
- protected function isPanelEngineConfigurable() {
+ protected function isMenuEngineConfigurable() {
return false;
}
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -935,7 +935,7 @@
$set_default = $request->getBool('default');
if ($set_default) {
$this
- ->getProfilePanelEngine()
+ ->getProfileMenuEngine()
->adjustDefault(PhabricatorProject::PANEL_WORKBOARD);
}
diff --git a/src/applications/project/controller/PhabricatorProjectController.php b/src/applications/project/controller/PhabricatorProjectController.php
--- a/src/applications/project/controller/PhabricatorProjectController.php
+++ b/src/applications/project/controller/PhabricatorProjectController.php
@@ -4,7 +4,7 @@
private $project;
private $profileMenu;
- private $profilePanelEngine;
+ private $profileMenuEngine;
protected function setProject(PhabricatorProject $project) {
$this->project = $project;
@@ -99,7 +99,7 @@
protected function getProfileMenu() {
if (!$this->profileMenu) {
- $engine = $this->getProfilePanelEngine();
+ $engine = $this->getProfileMenuEngine();
if ($engine) {
$this->profileMenu = $engine->buildNavigation();
}
@@ -127,24 +127,25 @@
return $crumbs;
}
- protected function getProfilePanelEngine() {
- if (!$this->profilePanelEngine) {
+ protected function getProfileMenuEngine() {
+ if (!$this->profileMenuEngine) {
$viewer = $this->getViewer();
$project = $this->getProject();
if ($project) {
- $engine = id(new PhabricatorProjectProfilePanelEngine())
+ $engine = id(new PhabricatorProjectProfileMenuEngine())
->setViewer($viewer)
->setController($this)
->setProfileObject($project);
- $this->profilePanelEngine = $engine;
+ $this->profileMenuEngine = $engine;
}
}
- return $this->profilePanelEngine;
+
+ return $this->profileMenuEngine;
}
- protected function setProfilePanelEngine(
- PhabricatorProjectProfilePanelEngine $engine) {
- $this->profilePanelEngine = $engine;
+ protected function setProfileMenuEngine(
+ PhabricatorProjectProfileMenuEngine $engine) {
+ $this->profileMenuEngine = $engine;
return $this;
}
diff --git a/src/applications/project/controller/PhabricatorProjectPanelController.php b/src/applications/project/controller/PhabricatorProjectPanelController.php
--- a/src/applications/project/controller/PhabricatorProjectPanelController.php
+++ b/src/applications/project/controller/PhabricatorProjectPanelController.php
@@ -12,11 +12,11 @@
$viewer = $this->getViewer();
$project = $this->getProject();
- $engine = id(new PhabricatorProjectProfilePanelEngine())
+ $engine = id(new PhabricatorProjectProfileMenuEngine())
->setProfileObject($project)
->setController($this);
- $this->setProfilePanelEngine($engine);
+ $this->setProfileMenuEngine($engine);
return $engine->buildResponse();
}
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
@@ -17,7 +17,7 @@
}
$project = $this->getProject();
- $engine = $this->getProfilePanelEngine();
+ $engine = $this->getProfileMenuEngine();
$default = $engine->getDefaultPanel();
switch ($default->getBuiltinKey()) {
diff --git a/src/applications/project/engine/PhabricatorProjectProfilePanelEngine.php b/src/applications/project/engine/PhabricatorProjectProfileMenuEngine.php
rename from src/applications/project/engine/PhabricatorProjectProfilePanelEngine.php
rename to src/applications/project/engine/PhabricatorProjectProfileMenuEngine.php
--- a/src/applications/project/engine/PhabricatorProjectProfilePanelEngine.php
+++ b/src/applications/project/engine/PhabricatorProjectProfileMenuEngine.php
@@ -1,9 +1,9 @@
<?php
-final class PhabricatorProjectProfilePanelEngine
- extends PhabricatorProfilePanelEngine {
+final class PhabricatorProjectProfileMenuEngine
+ extends PhabricatorProfileMenuEngine {
- protected function isPanelEngineConfigurable() {
+ protected function isMenuEngineConfigurable() {
return true;
}
diff --git a/src/applications/search/editor/PhabricatorProfilePanelEditEngine.php b/src/applications/search/editor/PhabricatorProfilePanelEditEngine.php
--- a/src/applications/search/editor/PhabricatorProfilePanelEditEngine.php
+++ b/src/applications/search/editor/PhabricatorProfilePanelEditEngine.php
@@ -5,7 +5,7 @@
const ENGINECONST = 'search.profilepanel';
- private $panelEngine;
+ private $menuEngine;
private $profileObject;
private $newPanelConfiguration;
private $isBuiltin;
@@ -14,13 +14,13 @@
return false;
}
- public function setPanelEngine(PhabricatorProfilePanelEngine $engine) {
- $this->panelEngine = $engine;
+ public function setMenuEngine(PhabricatorProfileMenuEngine $engine) {
+ $this->menuEngine = $engine;
return $this;
}
- public function getPanelEngine() {
- return $this->panelEngine;
+ public function getMenuEngine() {
+ return $this->menuEngine;
}
public function setProfileObject($profile_object) {
@@ -113,11 +113,11 @@
}
protected function getObjectCreateCancelURI($object) {
- return $this->getPanelEngine()->getConfigureURI();
+ return $this->getMenuEngine()->getConfigureURI();
}
protected function getObjectViewURI($object) {
- return $this->getPanelEngine()->getConfigureURI();
+ return $this->getMenuEngine()->getConfigureURI();
}
protected function buildCustomEditFields($object) {
diff --git a/src/applications/search/engine/PhabricatorProfilePanelEngine.php b/src/applications/search/engine/PhabricatorProfileMenuEngine.php
rename from src/applications/search/engine/PhabricatorProfilePanelEngine.php
rename to src/applications/search/engine/PhabricatorProfileMenuEngine.php
--- a/src/applications/search/engine/PhabricatorProfilePanelEngine.php
+++ b/src/applications/search/engine/PhabricatorProfileMenuEngine.php
@@ -1,6 +1,6 @@
<?php
-abstract class PhabricatorProfilePanelEngine extends Phobject {
+abstract class PhabricatorProfileMenuEngine extends Phobject {
private $viewer;
private $profileObject;
@@ -49,7 +49,7 @@
abstract protected function getPanelURI($path);
- abstract protected function isPanelEngineConfigurable();
+ abstract protected function isMenuEngineConfigurable();
public function buildResponse() {
$controller = $this->getController();
@@ -63,7 +63,7 @@
// If the engine is not configurable, don't respond to any of the editing
// or configuration routes.
- if (!$this->isPanelEngineConfigurable()) {
+ if (!$this->isMenuEngineConfigurable()) {
switch ($panel_action) {
case 'view':
break;
@@ -709,7 +709,7 @@
$controller = $this->getController();
return id(new PhabricatorProfilePanelEditEngine())
- ->setPanelEngine($this)
+ ->setMenuEngine($this)
->setProfileObject($object)
->setNewPanelConfiguration($configuration)
->setController($controller)
@@ -722,7 +722,7 @@
$controller = $this->getController();
return id(new PhabricatorProfilePanelEditEngine())
- ->setPanelEngine($this)
+ ->setMenuEngine($this)
->setProfileObject($object)
->setController($controller)
->buildResponse();
@@ -753,7 +753,7 @@
return id(new PhabricatorProfilePanelEditEngine())
->setIsBuiltin(true)
- ->setPanelEngine($this)
+ ->setMenuEngine($this)
->setProfileObject($object)
->setNewPanelConfiguration($configuration)
->setController($controller)
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Oct 29, 4:54 AM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6724150
Default Alt Text
D17025.diff (17 KB)
Attached To
Mode
D17025: Rename "PanelEngine" to "MenuEngine"
Attached
Detach File
Event Timeline
Log In to Comment