recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Move Settings to a separate directory

Summary:
We currently have two relatively distinct applications, "People" and "Settings", living in /people/. Move settings to its own directory.

This renames a couple of classes but makes no real code changes.

Test Plan: Browsed /settings/, changed some settings.

Reviewers: btrahan, vrana

Reviewed By: btrahan

CC: aran

Maniphest Tasks: T1569, T631

Differential Revision: https://secure.phabricator.com/D3256

epriestley df5bf75e b2f12a09

+26 -26
+19 -19
src/__phutil_library_map__.php
··· 558 558 'PhabricatorApplicationPhriction' => 'applications/phriction/application/PhabricatorApplicationPhriction.php', 559 559 'PhabricatorApplicationPonder' => 'applications/ponder/application/PhabricatorApplicationPonder.php', 560 560 'PhabricatorApplicationProject' => 'applications/project/application/PhabricatorApplicationProject.php', 561 - 'PhabricatorApplicationSettings' => 'applications/people/application/PhabricatorApplicationSettings.php', 561 + 'PhabricatorApplicationSettings' => 'applications/settings/application/PhabricatorApplicationSettings.php', 562 562 'PhabricatorApplicationStatusView' => 'applications/meta/view/PhabricatorApplicationStatusView.php', 563 563 'PhabricatorApplicationsController' => 'applications/meta/controller/PhabricatorApplicationsController.php', 564 564 'PhabricatorApplicationsListController' => 'applications/meta/controller/PhabricatorApplicationsListController.php', ··· 884 884 'PhabricatorPasteListController' => 'applications/paste/controller/PhabricatorPasteListController.php', 885 885 'PhabricatorPasteQuery' => 'applications/paste/query/PhabricatorPasteQuery.php', 886 886 'PhabricatorPasteViewController' => 'applications/paste/controller/PhabricatorPasteViewController.php', 887 - 'PhabricatorPeopleAdjustSettingController' => 'applications/people/controller/PhabricatorPeopleAdjustSettingController.php', 888 887 'PhabricatorPeopleController' => 'applications/people/controller/PhabricatorPeopleController.php', 889 888 'PhabricatorPeopleEditController' => 'applications/people/controller/PhabricatorPeopleEditController.php', 890 889 'PhabricatorPeopleLdapController' => 'applications/people/controller/PhabricatorPeopleLdapController.php', ··· 1002 1001 'PhabricatorSearchScope' => 'applications/search/constants/PhabricatorSearchScope.php', 1003 1002 'PhabricatorSearchSelectController' => 'applications/search/controller/PhabricatorSearchSelectController.php', 1004 1003 'PhabricatorSearchUserIndexer' => 'applications/search/index/indexer/PhabricatorSearchUserIndexer.php', 1004 + 'PhabricatorSettingsAdjustController' => 'applications/settings/controller/PhabricatorSettingsAdjustController.php', 1005 + 'PhabricatorSettingsMainController' => 'applications/settings/controller/PhabricatorSettingsMainController.php', 1005 1006 'PhabricatorSetup' => 'infrastructure/PhabricatorSetup.php', 1006 1007 'PhabricatorSlowvoteChoice' => 'applications/slowvote/storage/PhabricatorSlowvoteChoice.php', 1007 1008 'PhabricatorSlowvoteComment' => 'applications/slowvote/storage/PhabricatorSlowvoteComment.php', ··· 1052 1053 'PhabricatorUITooltipExample' => 'applications/uiexample/examples/PhabricatorUITooltipExample.php', 1053 1054 'PhabricatorUnitsTestCase' => 'view/__tests__/PhabricatorUnitsTestCase.php', 1054 1055 'PhabricatorUser' => 'applications/people/storage/PhabricatorUser.php', 1055 - 'PhabricatorUserAccountSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserAccountSettingsPanelController.php', 1056 - 'PhabricatorUserConduitSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserConduitSettingsPanelController.php', 1056 + 'PhabricatorUserAccountSettingsPanelController' => 'applications/settings/panel/PhabricatorUserAccountSettingsPanelController.php', 1057 + 'PhabricatorUserConduitSettingsPanelController' => 'applications/settings/panel/PhabricatorUserConduitSettingsPanelController.php', 1057 1058 'PhabricatorUserDAO' => 'applications/people/storage/PhabricatorUserDAO.php', 1058 1059 'PhabricatorUserEditor' => 'applications/people/PhabricatorUserEditor.php', 1059 1060 'PhabricatorUserEmail' => 'applications/people/storage/PhabricatorUserEmail.php', 1060 - 'PhabricatorUserEmailPreferenceSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserEmailPreferenceSettingsPanelController.php', 1061 - 'PhabricatorUserEmailSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserEmailSettingsPanelController.php', 1061 + 'PhabricatorUserEmailPreferenceSettingsPanelController' => 'applications/settings/panel/PhabricatorUserEmailPreferenceSettingsPanelController.php', 1062 + 'PhabricatorUserEmailSettingsPanelController' => 'applications/settings/panel/PhabricatorUserEmailSettingsPanelController.php', 1062 1063 'PhabricatorUserLDAPInfo' => 'applications/people/storage/PhabricatorUserLDAPInfo.php', 1063 - 'PhabricatorUserLDAPSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserLDAPSettingsPanelController.php', 1064 + 'PhabricatorUserLDAPSettingsPanelController' => 'applications/settings/panel/PhabricatorUserLDAPSettingsPanelController.php', 1064 1065 'PhabricatorUserLog' => 'applications/people/storage/PhabricatorUserLog.php', 1065 1066 'PhabricatorUserOAuthInfo' => 'applications/people/storage/PhabricatorUserOAuthInfo.php', 1066 - 'PhabricatorUserOAuthSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserOAuthSettingsPanelController.php', 1067 - 'PhabricatorUserPasswordSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserPasswordSettingsPanelController.php', 1068 - 'PhabricatorUserPreferenceSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserPreferenceSettingsPanelController.php', 1069 - 'PhabricatorUserPreferences' => 'applications/people/storage/PhabricatorUserPreferences.php', 1067 + 'PhabricatorUserOAuthSettingsPanelController' => 'applications/settings/panel/PhabricatorUserOAuthSettingsPanelController.php', 1068 + 'PhabricatorUserPasswordSettingsPanelController' => 'applications/settings/panel/PhabricatorUserPasswordSettingsPanelController.php', 1069 + 'PhabricatorUserPreferenceSettingsPanelController' => 'applications/settings/panel/PhabricatorUserPreferenceSettingsPanelController.php', 1070 + 'PhabricatorUserPreferences' => 'applications/settings/storage/PhabricatorUserPreferences.php', 1070 1071 'PhabricatorUserProfile' => 'applications/people/storage/PhabricatorUserProfile.php', 1071 - 'PhabricatorUserProfileSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserProfileSettingsPanelController.php', 1072 - 'PhabricatorUserSSHKey' => 'applications/people/storage/PhabricatorUserSSHKey.php', 1073 - 'PhabricatorUserSSHKeysSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserSSHKeysSettingsPanelController.php', 1074 - 'PhabricatorUserSearchSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserSearchSettingsPanelController.php', 1075 - 'PhabricatorUserSettingsController' => 'applications/people/controller/PhabricatorUserSettingsController.php', 1076 - 'PhabricatorUserSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserSettingsPanelController.php', 1072 + 'PhabricatorUserProfileSettingsPanelController' => 'applications/settings/panel/PhabricatorUserProfileSettingsPanelController.php', 1073 + 'PhabricatorUserSSHKey' => 'applications/settings/storage/PhabricatorUserSSHKey.php', 1074 + 'PhabricatorUserSSHKeysSettingsPanelController' => 'applications/settings/panel/PhabricatorUserSSHKeysSettingsPanelController.php', 1075 + 'PhabricatorUserSearchSettingsPanelController' => 'applications/settings/panel/PhabricatorUserSearchSettingsPanelController.php', 1076 + 'PhabricatorUserSettingsPanelController' => 'applications/settings/panel/PhabricatorUserSettingsPanelController.php', 1077 1077 'PhabricatorUserStatus' => 'applications/people/storage/PhabricatorUserStatus.php', 1078 1078 'PhabricatorUserTestCase' => 'applications/people/storage/__tests__/PhabricatorUserTestCase.php', 1079 1079 'PhabricatorWorker' => 'infrastructure/daemon/workers/PhabricatorWorker.php', ··· 1969 1969 'PhabricatorPasteListController' => 'PhabricatorPasteController', 1970 1970 'PhabricatorPasteQuery' => 'PhabricatorCursorPagedPolicyQuery', 1971 1971 'PhabricatorPasteViewController' => 'PhabricatorPasteController', 1972 - 'PhabricatorPeopleAdjustSettingController' => 'PhabricatorPeopleController', 1973 1972 'PhabricatorPeopleController' => 'PhabricatorController', 1974 1973 'PhabricatorPeopleEditController' => 'PhabricatorPeopleController', 1975 1974 'PhabricatorPeopleLdapController' => 'PhabricatorPeopleController', ··· 2073 2072 'PhabricatorSearchResultView' => 'AphrontView', 2074 2073 'PhabricatorSearchSelectController' => 'PhabricatorSearchBaseController', 2075 2074 'PhabricatorSearchUserIndexer' => 'PhabricatorSearchDocumentIndexer', 2075 + 'PhabricatorSettingsAdjustController' => 'PhabricatorController', 2076 + 'PhabricatorSettingsMainController' => 'PhabricatorController', 2076 2077 'PhabricatorSlowvoteChoice' => 'PhabricatorSlowvoteDAO', 2077 2078 'PhabricatorSlowvoteComment' => 'PhabricatorSlowvoteDAO', 2078 2079 'PhabricatorSlowvoteController' => 'PhabricatorController', ··· 2137 2138 'PhabricatorUserSSHKey' => 'PhabricatorUserDAO', 2138 2139 'PhabricatorUserSSHKeysSettingsPanelController' => 'PhabricatorUserSettingsPanelController', 2139 2140 'PhabricatorUserSearchSettingsPanelController' => 'PhabricatorUserSettingsPanelController', 2140 - 'PhabricatorUserSettingsController' => 'PhabricatorPeopleController', 2141 2141 'PhabricatorUserSettingsPanelController' => 'PhabricatorPeopleController', 2142 2142 'PhabricatorUserStatus' => 'PhabricatorUserDAO', 2143 2143 'PhabricatorUserTestCase' => 'PhabricatorTestCase',
+2 -2
src/applications/people/application/PhabricatorApplicationSettings.php src/applications/settings/application/PhabricatorApplicationSettings.php
··· 33 33 public function getRoutes() { 34 34 return array( 35 35 '/settings/' => array( 36 - '(?:page/(?P<page>[^/]+)/)?' => 'PhabricatorUserSettingsController', 37 - 'adjust/' => 'PhabricatorPeopleAdjustSettingController', 36 + '(?:page/(?P<page>[^/]+)/)?' => 'PhabricatorSettingsMainController', 37 + 'adjust/' => 'PhabricatorSettingsAdjustController', 38 38 ), 39 39 ); 40 40 }
+2 -2
src/applications/people/controller/PhabricatorPeopleAdjustSettingController.php src/applications/settings/controller/PhabricatorSettingsAdjustController.php
··· 16 16 * limitations under the License. 17 17 */ 18 18 19 - final class PhabricatorPeopleAdjustSettingController 20 - extends PhabricatorPeopleController { 19 + final class PhabricatorSettingsAdjustController 20 + extends PhabricatorController { 21 21 22 22 public function processRequest() { 23 23 $request = $this->getRequest();
+2 -2
src/applications/people/controller/PhabricatorUserSettingsController.php src/applications/settings/controller/PhabricatorSettingsMainController.php
··· 16 16 * limitations under the License. 17 17 */ 18 18 19 - final class PhabricatorUserSettingsController 20 - extends PhabricatorPeopleController { 19 + final class PhabricatorSettingsMainController 20 + extends PhabricatorController { 21 21 22 22 private $page; 23 23 private $pages;
src/applications/people/controller/settings/panels/PhabricatorUserAccountSettingsPanelController.php src/applications/settings/panel/PhabricatorUserAccountSettingsPanelController.php
src/applications/people/controller/settings/panels/PhabricatorUserConduitSettingsPanelController.php src/applications/settings/panel/PhabricatorUserConduitSettingsPanelController.php
src/applications/people/controller/settings/panels/PhabricatorUserEmailPreferenceSettingsPanelController.php src/applications/settings/panel/PhabricatorUserEmailPreferenceSettingsPanelController.php
src/applications/people/controller/settings/panels/PhabricatorUserEmailSettingsPanelController.php src/applications/settings/panel/PhabricatorUserEmailSettingsPanelController.php
src/applications/people/controller/settings/panels/PhabricatorUserLDAPSettingsPanelController.php src/applications/settings/panel/PhabricatorUserLDAPSettingsPanelController.php
src/applications/people/controller/settings/panels/PhabricatorUserOAuthSettingsPanelController.php src/applications/settings/panel/PhabricatorUserOAuthSettingsPanelController.php
src/applications/people/controller/settings/panels/PhabricatorUserPasswordSettingsPanelController.php src/applications/settings/panel/PhabricatorUserPasswordSettingsPanelController.php
src/applications/people/controller/settings/panels/PhabricatorUserPreferenceSettingsPanelController.php src/applications/settings/panel/PhabricatorUserPreferenceSettingsPanelController.php
src/applications/people/controller/settings/panels/PhabricatorUserProfileSettingsPanelController.php src/applications/settings/panel/PhabricatorUserProfileSettingsPanelController.php
src/applications/people/controller/settings/panels/PhabricatorUserSSHKeysSettingsPanelController.php src/applications/settings/panel/PhabricatorUserSSHKeysSettingsPanelController.php
src/applications/people/controller/settings/panels/PhabricatorUserSearchSettingsPanelController.php src/applications/settings/panel/PhabricatorUserSearchSettingsPanelController.php
+1 -1
src/applications/people/controller/settings/panels/PhabricatorUserSettingsPanelController.php src/applications/settings/panel/PhabricatorUserSettingsPanelController.php
··· 1 1 <?php 2 2 3 3 /* 4 - * Copyright 2011 Facebook, Inc. 4 + * Copyright 2012 Facebook, Inc. 5 5 * 6 6 * Licensed under the Apache License, Version 2.0 (the "License"); 7 7 * you may not use this file except in compliance with the License.
src/applications/people/storage/PhabricatorUserPreferences.php src/applications/settings/storage/PhabricatorUserPreferences.php
src/applications/people/storage/PhabricatorUserSSHKey.php src/applications/settings/storage/PhabricatorUserSSHKey.php