Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F18097385
D7924.id17933.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
19 KB
Referenced Files
None
Subscribers
None
D7924.id17933.diff
View Options
Index: resources/celerity/map.php
===================================================================
--- resources/celerity/map.php
+++ resources/celerity/map.php
@@ -7,7 +7,7 @@
return array(
'names' =>
array(
- 'core.pkg.css' => '3c41daee',
+ 'core.pkg.css' => '9567aaae',
'core.pkg.js' => 'c907bd96',
'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => '827749c1',
@@ -23,7 +23,7 @@
'rsrc/css/aphront/context-bar.css' => '1c3b0529',
'rsrc/css/aphront/dark-console.css' => '6378ef3d',
'rsrc/css/aphront/dialog-view.css' => 'dd9db96c',
- 'rsrc/css/aphront/error-view.css' => '472968e0',
+ 'rsrc/css/aphront/error-view.css' => 'ca515eae',
'rsrc/css/aphront/lightbox-attachment.css' => '686f8885',
'rsrc/css/aphront/list-filter-view.css' => '9577c6da',
'rsrc/css/aphront/multi-column.css' => '05bbd016',
@@ -475,7 +475,7 @@
'aphront-contextbar-view-css' => '1c3b0529',
'aphront-dark-console-css' => '6378ef3d',
'aphront-dialog-view-css' => 'dd9db96c',
- 'aphront-error-view-css' => '472968e0',
+ 'aphront-error-view-css' => 'ca515eae',
'aphront-list-filter-view-css' => '9577c6da',
'aphront-multi-column-view-css' => '05bbd016',
'aphront-notes' => '6acadd3f',
Index: src/applications/differential/controller/DifferentialRevisionEditController.php
===================================================================
--- src/applications/differential/controller/DifferentialRevisionEditController.php
+++ src/applications/differential/controller/DifferentialRevisionEditController.php
@@ -111,7 +111,6 @@
$error_view = null;
if ($errors) {
$error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
}
Index: src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
===================================================================
--- src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
+++ src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
@@ -87,7 +87,6 @@
$error_view = null;
if ($errors) {
$error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
}
Index: src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php
===================================================================
--- src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php
+++ src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php
@@ -64,7 +64,6 @@
$error_view = null;
if ($errors) {
$error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
}
Index: src/applications/diffusion/controller/DiffusionRepositoryEditLocalController.php
===================================================================
--- src/applications/diffusion/controller/DiffusionRepositoryEditLocalController.php
+++ src/applications/diffusion/controller/DiffusionRepositoryEditLocalController.php
@@ -36,7 +36,6 @@
$error_view = null;
if ($errors) {
$error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
}
Index: src/applications/diffusion/panel/DiffusionSetPasswordPanel.php
===================================================================
--- src/applications/diffusion/panel/DiffusionSetPasswordPanel.php
+++ src/applications/diffusion/panel/DiffusionSetPasswordPanel.php
@@ -89,7 +89,6 @@
$error_view = null;
if ($errors) {
$error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
}
Index: src/applications/files/controller/PhabricatorFileUploadController.php
===================================================================
--- src/applications/files/controller/PhabricatorFileUploadController.php
+++ src/applications/files/controller/PhabricatorFileUploadController.php
@@ -66,7 +66,6 @@
if ($errors) {
$errors = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
}
Index: src/applications/herald/controller/HeraldRuleController.php
===================================================================
--- src/applications/herald/controller/HeraldRuleController.php
+++ src/applications/herald/controller/HeraldRuleController.php
@@ -120,7 +120,6 @@
if ($errors) {
$error_view = new AphrontErrorView();
- $error_view->setTitle(pht('Form Errors'));
$error_view->setErrors($errors);
} else {
$error_view = null;
Index: src/applications/herald/controller/HeraldTestConsoleController.php
===================================================================
--- src/applications/herald/controller/HeraldTestConsoleController.php
+++ src/applications/herald/controller/HeraldTestConsoleController.php
@@ -81,7 +81,6 @@
if ($errors) {
$error_view = new AphrontErrorView();
- $error_view->setTitle(pht('Form Errors'));
$error_view->setErrors($errors);
} else {
$error_view = null;
Index: src/applications/macro/controller/PhabricatorMacroAudioController.php
===================================================================
--- src/applications/macro/controller/PhabricatorMacroAudioController.php
+++ src/applications/macro/controller/PhabricatorMacroAudioController.php
@@ -84,7 +84,6 @@
if ($errors) {
$error_view = new AphrontErrorView();
- $error_view->setTitle(pht('Form Errors'));
$error_view->setErrors($errors);
} else {
$error_view = null;
Index: src/applications/macro/controller/PhabricatorMacroEditController.php
===================================================================
--- src/applications/macro/controller/PhabricatorMacroEditController.php
+++ src/applications/macro/controller/PhabricatorMacroEditController.php
@@ -137,7 +137,6 @@
if ($errors) {
$error_view = new AphrontErrorView();
- $error_view->setTitle(pht('Form Errors'));
$error_view->setErrors($errors);
} else {
$error_view = null;
Index: src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php
===================================================================
--- src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php
+++ src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php
@@ -77,7 +77,6 @@
$error_view = null;
if ($errors) {
$error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
}
Index: src/applications/maniphest/controller/ManiphestTaskEditController.php
===================================================================
--- src/applications/maniphest/controller/ManiphestTaskEditController.php
+++ src/applications/maniphest/controller/ManiphestTaskEditController.php
@@ -419,7 +419,6 @@
if ($errors) {
$error_view = new AphrontErrorView();
$error_view->setErrors($errors);
- $error_view->setTitle(pht('Form Errors'));
}
$priority_map = ManiphestTaskPriority::getTaskPriorityMap();
Index: src/applications/people/controller/PhabricatorPeopleEditController.php
===================================================================
--- src/applications/people/controller/PhabricatorPeopleEditController.php
+++ src/applications/people/controller/PhabricatorPeopleEditController.php
@@ -217,189 +217,6 @@
$error_view = null;
if ($errors) {
$error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
- ->setErrors($errors);
- }
-
- $form = new AphrontFormView();
- $form->setUser($admin);
- if ($user->getID()) {
- $form->setAction('/people/edit/'.$user->getID().'/');
- } else {
- $form->setAction('/people/edit/');
- }
-
- if ($user->getID()) {
- $is_immutable = true;
- } else {
- $is_immutable = false;
- }
-
- $form
- ->appendChild(
- id(new AphrontFormTextControl())
- ->setLabel(pht('Username'))
- ->setName('username')
- ->setValue($user->getUsername())
- ->setError($e_username)
- ->setDisabled($is_immutable))
- ->appendChild(
- id(new AphrontFormTextControl())
- ->setLabel(pht('Real Name'))
- ->setName('realname')
- ->setValue($user->getRealName())
- ->setError($e_realname));
-
- if (!$user->getID()) {
- $form->appendChild(
- id(new AphrontFormTextControl())
- ->setLabel(pht('Email'))
- ->setName('email')
- ->setDisabled($is_immutable)
- ->setValue($new_email)
- ->setCaption(PhabricatorUserEmail::describeAllowedAddresses())
- ->setError($e_email));
- } else {
- $email = $user->loadPrimaryEmail();
- if ($email) {
- $status = $email->getIsVerified() ?
- pht('Verified') : pht('Unverified');
- } else {
- $status = pht('No Email Address');
- }
-
- $form->appendChild(
- id(new AphrontFormStaticControl())
- ->setLabel(pht('Email'))
- ->setValue($status));
-
- $form->appendChild(
- id(new AphrontFormCheckboxControl())
- ->addCheckbox(
- 'welcome',
- 1,
- pht('Re-send "Welcome to Phabricator" email.'),
- false));
-
- }
-
- $form->appendChild($this->getRoleInstructions());
-
- if (!$user->getID()) {
- $form
- ->appendChild(
- id(new AphrontFormSelectControl())
- ->setLabel(pht('Role'))
- ->setName('role')
- ->setValue('user')
- ->setOptions(
- array(
- 'user' => pht('Normal User'),
- 'agent' => pht('System Agent'),
- ))
- ->setCaption(
- pht('You can create a "system agent" account for bots, '.
- 'scripts, etc.')))
- ->appendChild(
- id(new AphrontFormCheckboxControl())
- ->addCheckbox(
- 'welcome',
- 1,
- pht('Send "Welcome to Phabricator" email.'),
- $welcome_checked));
- } else {
- $roles = array();
-
- if ($user->getIsSystemAgent()) {
- $roles[] = pht('System Agent');
- }
- if ($user->getIsAdmin()) {
- $roles[] = pht('Admin');
- }
- if ($user->getIsDisabled()) {
- $roles[] = pht('Disabled');
- }
- if (!$user->getIsApproved()) {
- $roles[] = pht('Not Approved');
- }
- if (!$roles) {
- $roles[] = pht('Normal User');
- }
-
- $roles = implode(', ', $roles);
-
- $form->appendChild(
- id(new AphrontFormStaticControl())
- ->setLabel(pht('Roles'))
- ->setValue($roles));
- }
-
- $form
- ->appendChild(
- id(new AphrontFormSubmitControl())
- ->setValue(pht('Save')));
-
- if ($user->getID()) {
- $title = pht('Edit User');
- } else {
- $title = pht('Create New User');
- }
-
- $form_box = id(new PHUIObjectBoxView())
- ->setHeaderText($title)
- ->setFormError($error_view)
- ->setForm($form);
-
- return array($form_box);
- }
-
- private function processRoleRequest(PhabricatorUser $user) {
- $request = $this->getRequest();
- $admin = $request->getUser();
-
- $is_self = ($user->getID() == $admin->getID());
-
- $errors = array();
-
- if ($request->isFormPost()) {
-
- $log_template = PhabricatorUserLog::newLog(
- $admin,
- $user,
- null);
-
- $logs = array();
-
- if ($is_self) {
- $errors[] = pht("You can not edit your own role.");
- } else {
- $new_admin = (bool)$request->getBool('is_admin');
- $old_admin = (bool)$user->getIsAdmin();
- if ($new_admin != $old_admin) {
- id(new PhabricatorUserEditor())
- ->setActor($admin)
- ->makeAdminUser($user, $new_admin);
- }
-
- $new_disabled = (bool)$request->getBool('is_disabled');
- $old_disabled = (bool)$user->getIsDisabled();
- if ($new_disabled != $old_disabled) {
- id(new PhabricatorUserEditor())
- ->setActor($admin)
- ->disableUser($user, $new_disabled);
- }
- }
-
- if (!$errors) {
- return id(new AphrontRedirectResponse())
- ->setURI($request->getRequestURI()->alter('saved', 'true'));
- }
- }
-
- $error_view = null;
- if ($errors) {
- $error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
}
@@ -539,7 +356,6 @@
if ($errors) {
$errors = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
} else {
$errors = null;
@@ -638,7 +454,6 @@
if ($errors) {
$errors = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
} else {
$errors = null;
@@ -777,7 +592,6 @@
$error_view = null;
if ($errors) {
$error_view = new AphrontErrorView();
- $error_view->setTitle(pht('Form Errors'));
$error_view->setErrors($errors);
} else {
if ($request->getStr('saved')) {
Index: src/applications/phame/controller/blog/PhameBlogEditController.php
===================================================================
--- src/applications/phame/controller/blog/PhameBlogEditController.php
+++ src/applications/phame/controller/blog/PhameBlogEditController.php
@@ -164,7 +164,6 @@
if ($errors) {
$error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
} else {
$error_view = null;
Index: src/applications/pholio/controller/PholioMockEditController.php
===================================================================
--- src/applications/pholio/controller/PholioMockEditController.php
+++ src/applications/pholio/controller/PholioMockEditController.php
@@ -201,7 +201,6 @@
if ($errors) {
$error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
} else {
$error_view = null;
Index: src/applications/phriction/controller/PhrictionEditController.php
===================================================================
--- src/applications/phriction/controller/PhrictionEditController.php
+++ src/applications/phriction/controller/PhrictionEditController.php
@@ -152,7 +152,6 @@
$error_view = null;
if ($errors) {
$error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
}
Index: src/applications/phriction/controller/PhrictionMoveController.php
===================================================================
--- src/applications/phriction/controller/PhrictionMoveController.php
+++ src/applications/phriction/controller/PhrictionMoveController.php
@@ -111,7 +111,6 @@
if ($errors) {
$error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
}
Index: src/applications/ponder/controller/PonderQuestionEditController.php
===================================================================
--- src/applications/ponder/controller/PonderQuestionEditController.php
+++ src/applications/ponder/controller/PonderQuestionEditController.php
@@ -79,7 +79,6 @@
$error_view = null;
if ($errors) {
$error_view = id(new AphrontErrorView())
- ->setTitle(pht('Form Errors'))
->setErrors($errors);
}
Index: src/applications/project/controller/PhabricatorProjectCreateController.php
===================================================================
--- src/applications/project/controller/PhabricatorProjectCreateController.php
+++ src/applications/project/controller/PhabricatorProjectCreateController.php
@@ -67,7 +67,6 @@
$error_view = null;
if ($errors) {
$error_view = new AphrontErrorView();
- $error_view->setTitle(pht('Form Errors'));
$error_view->setErrors($errors);
}
Index: src/applications/project/controller/PhabricatorProjectProfileEditController.php
===================================================================
--- src/applications/project/controller/PhabricatorProjectProfileEditController.php
+++ src/applications/project/controller/PhabricatorProjectProfileEditController.php
@@ -96,7 +96,6 @@
$error_view = null;
if ($errors) {
$error_view = new AphrontErrorView();
- $error_view->setTitle(pht('Form Errors'));
$error_view->setErrors($errors);
}
Index: src/applications/releeph/controller/branch/ReleephBranchCreateController.php
===================================================================
--- src/applications/releeph/controller/branch/ReleephBranchCreateController.php
+++ src/applications/releeph/controller/branch/ReleephBranchCreateController.php
@@ -68,7 +68,6 @@
if ($errors) {
$error_view = new AphrontErrorView();
$error_view->setErrors($errors);
- $error_view->setTitle(pht('Form Errors'));
}
$project_id = $releeph_project->getID();
Index: src/applications/releeph/controller/project/ReleephProjectEditController.php
===================================================================
--- src/applications/releeph/controller/project/ReleephProjectEditController.php
+++ src/applications/releeph/controller/project/ReleephProjectEditController.php
@@ -116,7 +116,6 @@
if ($errors) {
$error_view = new AphrontErrorView();
$error_view->setErrors($errors);
- $error_view->setTitle(pht('Form Errors'));
}
$projects = mpull(
Index: src/applications/releeph/controller/request/ReleephRequestEditController.php
===================================================================
--- src/applications/releeph/controller/request/ReleephRequestEditController.php
+++ src/applications/releeph/controller/request/ReleephRequestEditController.php
@@ -204,7 +204,6 @@
if ($errors) {
$error_view = new AphrontErrorView();
$error_view->setErrors($errors);
- $error_view->setTitle('Form Errors');
}
$form = id(new AphrontFormView())
Index: src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
===================================================================
--- src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
+++ src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
@@ -80,7 +80,6 @@
}
} else {
$notice = new AphrontErrorView();
- $notice->setTitle(pht('Form Errors'));
$notice->setErrors($errors);
}
Index: src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
===================================================================
--- src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
+++ src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
@@ -129,7 +129,6 @@
$error_view = null;
if ($errors) {
$error_view = new AphrontErrorView();
- $error_view->setTitle(pht('Form Errors'));
$error_view->setErrors($errors);
}
Index: src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
===================================================================
--- src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
+++ src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php
@@ -126,7 +126,6 @@
$error_view = null;
if ($errors) {
$error_view = new AphrontErrorView();
- $error_view->setTitle(pht('Form Errors'));
$error_view->setErrors($errors);
}
Index: webroot/rsrc/css/aphront/error-view.css
===================================================================
--- webroot/rsrc/css/aphront/error-view.css
+++ webroot/rsrc/css/aphront/error-view.css
@@ -9,7 +9,7 @@
}
form.aphront-dialog-view .aphront-error-view {
- margin: 8px 0;
+ margin: 0 0 12px 0;
}
.aphront-error-view {
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Aug 9 2025, 1:06 PM (16 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
9087050
Default Alt Text
D7924.id17933.diff (19 KB)
Attached To
Mode
D7924: Simplify PHUIObjectBoxViews handling of Save and Error states
Attached
Detach File
Event Timeline
Log In to Comment