Page MenuHomePhabricator
Files F15420977

D16034.id38567.diff
No OneTemporary
Actions

D16034.id38567.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
@@ -2144,6 +2144,7 @@
'PhabricatorConfigVersionsModule' => 'applications/config/module/PhabricatorConfigVersionsModule.php',
'PhabricatorConfigWelcomeController' => 'applications/config/controller/PhabricatorConfigWelcomeController.php',
'PhabricatorConpherenceApplication' => 'applications/conpherence/application/PhabricatorConpherenceApplication.php',
+ 'PhabricatorConpherenceColumnVisibleSetting' => 'applications/settings/setting/PhabricatorConpherenceColumnVisibleSetting.php',
'PhabricatorConpherenceNotificationsSetting' => 'applications/settings/setting/PhabricatorConpherenceNotificationsSetting.php',
'PhabricatorConpherencePreferencesSettingsPanel' => 'applications/settings/panel/PhabricatorConpherencePreferencesSettingsPanel.php',
'PhabricatorConpherenceThreadPHIDType' => 'applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php',
@@ -2515,6 +2516,7 @@
'PhabricatorFilesManagementWorkflow' => 'applications/files/management/PhabricatorFilesManagementWorkflow.php',
'PhabricatorFilesOnDiskBuiltinFile' => 'applications/files/builtin/PhabricatorFilesOnDiskBuiltinFile.php',
'PhabricatorFilesOutboundRequestAction' => 'applications/files/action/PhabricatorFilesOutboundRequestAction.php',
+ 'PhabricatorFiletreeVisibleSetting' => 'applications/settings/setting/PhabricatorFiletreeVisibleSetting.php',
'PhabricatorFlag' => 'applications/flag/storage/PhabricatorFlag.php',
'PhabricatorFlagAddFlagHeraldAction' => 'applications/flag/herald/PhabricatorFlagAddFlagHeraldAction.php',
'PhabricatorFlagColor' => 'applications/flag/constants/PhabricatorFlagColor.php',
@@ -3049,6 +3051,7 @@
'PhabricatorPolicyTestObject' => 'applications/policy/__tests__/PhabricatorPolicyTestObject.php',
'PhabricatorPolicyType' => 'applications/policy/constants/PhabricatorPolicyType.php',
'PhabricatorPonderApplication' => 'applications/ponder/application/PhabricatorPonderApplication.php',
+ 'PhabricatorProfileMenuCollapsedSetting' => 'applications/settings/setting/PhabricatorProfileMenuCollapsedSetting.php',
'PhabricatorProfilePanel' => 'applications/search/profilepanel/PhabricatorProfilePanel.php',
'PhabricatorProfilePanelConfiguration' => 'applications/search/storage/PhabricatorProfilePanelConfiguration.php',
'PhabricatorProfilePanelConfigurationQuery' => 'applications/search/query/PhabricatorProfilePanelConfigurationQuery.php',
@@ -6692,6 +6695,7 @@
'PhabricatorConfigVersionsModule' => 'PhabricatorConfigModule',
'PhabricatorConfigWelcomeController' => 'PhabricatorConfigController',
'PhabricatorConpherenceApplication' => 'PhabricatorApplication',
+ 'PhabricatorConpherenceColumnVisibleSetting' => 'PhabricatorInternalSetting',
'PhabricatorConpherenceNotificationsSetting' => 'PhabricatorSelectSetting',
'PhabricatorConpherencePreferencesSettingsPanel' => 'PhabricatorEditEngineSettingsPanel',
'PhabricatorConpherenceThreadPHIDType' => 'PhabricatorPHIDType',
@@ -7126,6 +7130,7 @@
'PhabricatorFilesManagementWorkflow' => 'PhabricatorManagementWorkflow',
'PhabricatorFilesOnDiskBuiltinFile' => 'PhabricatorFilesBuiltinFile',
'PhabricatorFilesOutboundRequestAction' => 'PhabricatorSystemAction',
+ 'PhabricatorFiletreeVisibleSetting' => 'PhabricatorInternalSetting',
'PhabricatorFlag' => array(
'PhabricatorFlagDAO',
'PhabricatorPolicyInterface',
@@ -7732,6 +7737,7 @@
),
'PhabricatorPolicyType' => 'PhabricatorPolicyConstants',
'PhabricatorPonderApplication' => 'PhabricatorApplication',
+ 'PhabricatorProfileMenuCollapsedSetting' => 'PhabricatorInternalSetting',
'PhabricatorProfilePanel' => 'Phobject',
'PhabricatorProfilePanelConfiguration' => array(
'PhabricatorSearchDAO',
diff --git a/src/applications/conpherence/view/ConpherenceDurableColumnView.php b/src/applications/conpherence/view/ConpherenceDurableColumnView.php
--- a/src/applications/conpherence/view/ConpherenceDurableColumnView.php
+++ b/src/applications/conpherence/view/ConpherenceDurableColumnView.php
@@ -108,7 +108,7 @@
}
protected function getTagContent() {
- $column_key = PhabricatorUserPreferences::PREFERENCE_CONPHERENCE_COLUMN;
+ $column_key = PhabricatorConpherenceColumnVisibleSetting::SETTINGKEY;
Javelin::initBehavior(
'durable-column',
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -381,7 +381,7 @@
$nav = null;
if ($filetree_on) {
- $collapsed_key = PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED;
+ $collapsed_key = PhabricatorFiletreeVisibleSetting::SETTINGKEY;
$collapsed_value = $viewer->getUserSetting($collapsed_key);
$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -329,7 +329,7 @@
PhabricatorShowFiletreeSetting::SETTINGKEY,
PhabricatorShowFiletreeSetting::VALUE_ENABLE_FILETREE);
- $pref_collapse = PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED;
+ $pref_collapse = PhabricatorFiletreeVisibleSetting::SETTINGKEY;
$collapsed = $viewer->getUserSetting($pref_collapse);
$nav = null;
diff --git a/src/applications/search/engine/PhabricatorProfilePanelEngine.php b/src/applications/search/engine/PhabricatorProfilePanelEngine.php
--- a/src/applications/search/engine/PhabricatorProfilePanelEngine.php
+++ b/src/applications/search/engine/PhabricatorProfilePanelEngine.php
@@ -382,8 +382,7 @@
$collapse_id = celerity_generate_unique_node_id();
$viewer = $this->getViewer();
- $collapse_key =
- PhabricatorUserPreferences::PREFERENCE_PROFILE_MENU_COLLAPSED;
+ $collapse_key = PhabricatorProfileMenuCollapsedSetting::SETTINGKEY;
$is_collapsed = $viewer->getUserSetting($collapse_key);
diff --git a/src/applications/settings/setting/PhabricatorConpherenceColumnVisibleSetting.php b/src/applications/settings/setting/PhabricatorConpherenceColumnVisibleSetting.php
new file mode 100644
--- /dev/null
+++ b/src/applications/settings/setting/PhabricatorConpherenceColumnVisibleSetting.php
@@ -0,0 +1,12 @@
+<?php
+
+final class PhabricatorConpherenceColumnVisibleSetting
+ extends PhabricatorInternalSetting {
+
+ const SETTINGKEY = 'conpherence-column';
+
+ public function getSettingName() {
+ return pht('Conpherence Column Visible');
+ }
+
+}
diff --git a/src/applications/settings/setting/PhabricatorFiletreeVisibleSetting.php b/src/applications/settings/setting/PhabricatorFiletreeVisibleSetting.php
new file mode 100644
--- /dev/null
+++ b/src/applications/settings/setting/PhabricatorFiletreeVisibleSetting.php
@@ -0,0 +1,12 @@
+<?php
+
+final class PhabricatorFiletreeVisibleSetting
+ extends PhabricatorInternalSetting {
+
+ const SETTINGKEY = 'nav-collapsed';
+
+ public function getSettingName() {
+ return pht('Filetree Visible');
+ }
+
+}
diff --git a/src/applications/settings/setting/PhabricatorProfileMenuCollapsedSetting.php b/src/applications/settings/setting/PhabricatorProfileMenuCollapsedSetting.php
new file mode 100644
--- /dev/null
+++ b/src/applications/settings/setting/PhabricatorProfileMenuCollapsedSetting.php
@@ -0,0 +1,12 @@
+<?php
+
+final class PhabricatorProfileMenuCollapsedSetting
+ extends PhabricatorInternalSetting {
+
+ const SETTINGKEY = 'profile-menu.collapsed';
+
+ public function getSettingName() {
+ return pht('Profile Menu Collapsed');
+ }
+
+}
diff --git a/src/applications/settings/storage/PhabricatorUserPreferences.php b/src/applications/settings/storage/PhabricatorUserPreferences.php
--- a/src/applications/settings/storage/PhabricatorUserPreferences.php
+++ b/src/applications/settings/storage/PhabricatorUserPreferences.php
@@ -14,13 +14,7 @@
const PREFERENCE_VARY_SUBJECT = 'vary-subject';
const PREFERENCE_HTML_EMAILS = 'html-emails';
- const PREFERENCE_NAV_COLLAPSED = 'nav-collapsed';
- const PREFERENCE_APP_TILES = 'app-tiles';
- const PREFERENCE_APP_PINNED = 'app-pinned';
-
- const PREFERENCE_CONPHERENCE_COLUMN = 'conpherence-column';
const PREFERENCE_DESKTOP_NOTIFICATIONS = 'desktop-notifications';
- const PREFERENCE_PROFILE_MENU_COLLAPSED = 'profile-menu.collapsed';
// These are in an unusual order for historic reasons.
const MAILTAG_PREFERENCE_NOTIFY = 0;
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -132,7 +132,7 @@
}
public function getDurableColumnVisible() {
- $column_key = PhabricatorUserPreferences::PREFERENCE_CONPHERENCE_COLUMN;
+ $column_key = PhabricatorConpherenceColumnVisibleSetting::SETTINGKEY;
return (bool)$this->getUserPreference($column_key, false);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 22, 7:44 PM (3 h, 44 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7223149
Default Alt Text
D16034.id38567.diff (9 KB)

Event Timeline

Phabricator · Built by Phacility