Page MenuHomePhabricator
Files F15285485

D8670.id20558.diff
No OneTemporary
Actions

D8670.id20558.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
@@ -1821,6 +1821,7 @@
'PhabricatorPeopleRenameController' => 'applications/people/controller/PhabricatorPeopleRenameController.php',
'PhabricatorPeopleSearchEngine' => 'applications/people/query/PhabricatorPeopleSearchEngine.php',
'PhabricatorPeopleTestDataGenerator' => 'applications/people/lipsum/PhabricatorPeopleTestDataGenerator.php',
+ 'PhabricatorPeopleWelcomeController' => 'applications/people/controller/PhabricatorPeopleWelcomeController.php',
'PhabricatorPhameConfigOptions' => 'applications/phame/config/PhabricatorPhameConfigOptions.php',
'PhabricatorPhamePHIDTypeBlog' => 'applications/phame/phid/PhabricatorPhamePHIDTypeBlog.php',
'PhabricatorPhamePHIDTypePost' => 'applications/phame/phid/PhabricatorPhamePHIDTypePost.php',
@@ -4630,6 +4631,7 @@
'PhabricatorPeopleRenameController' => 'PhabricatorPeopleController',
'PhabricatorPeopleSearchEngine' => 'PhabricatorApplicationSearchEngine',
'PhabricatorPeopleTestDataGenerator' => 'PhabricatorTestDataGenerator',
+ 'PhabricatorPeopleWelcomeController' => 'PhabricatorPeopleController',
'PhabricatorPhameConfigOptions' => 'PhabricatorApplicationConfigOptions',
'PhabricatorPhamePHIDTypeBlog' => 'PhabricatorPHIDType',
'PhabricatorPhamePHIDTypePost' => 'PhabricatorPHIDType',
diff --git a/src/applications/people/application/PhabricatorApplicationPeople.php b/src/applications/people/application/PhabricatorApplicationPeople.php
--- a/src/applications/people/application/PhabricatorApplicationPeople.php
+++ b/src/applications/people/application/PhabricatorApplicationPeople.php
@@ -49,8 +49,8 @@
'empower/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleEmpowerController',
'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleDeleteController',
'rename/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleRenameController',
- 'edit/(?:(?P<id>[1-9]\d*)/(?:(?P<view>\w+)/)?)?'
- => 'PhabricatorPeopleEditController',
+ 'welcome/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleWelcomeController',
+ 'edit/' => 'PhabricatorPeopleEditController',
'ldap/' => 'PhabricatorPeopleLdapController',
'editprofile/(?P<id>[1-9]\d*)/' =>
'PhabricatorPeopleProfileEditController',
diff --git a/src/applications/people/controller/PhabricatorPeopleDeleteController.php b/src/applications/people/controller/PhabricatorPeopleDeleteController.php
--- a/src/applications/people/controller/PhabricatorPeopleDeleteController.php
+++ b/src/applications/people/controller/PhabricatorPeopleDeleteController.php
@@ -21,7 +21,7 @@
return new Aphront404Response();
}
- $profile_uri = '/p/'.$user->getUsername();
+ $profile_uri = '/p/'.$user->getUsername().'/';
if ($user->getPHID() == $admin->getPHID()) {
return $this->buildDeleteSelfResponse($profile_uri);
diff --git a/src/applications/people/controller/PhabricatorPeopleEditController.php b/src/applications/people/controller/PhabricatorPeopleEditController.php
--- a/src/applications/people/controller/PhabricatorPeopleEditController.php
+++ b/src/applications/people/controller/PhabricatorPeopleEditController.php
@@ -3,83 +3,31 @@
final class PhabricatorPeopleEditController
extends PhabricatorPeopleController {
- private $id;
- private $view;
-
- public function willProcessRequest(array $data) {
- $this->id = idx($data, 'id');
- $this->view = idx($data, 'view');
- }
-
public function processRequest() {
$request = $this->getRequest();
$admin = $request->getUser();
$crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
- if ($this->id) {
- $user = id(new PhabricatorUser())->load($this->id);
- if (!$user) {
- return new Aphront404Response();
- }
- $base_uri = '/people/edit/'.$user->getID().'/';
- $crumbs->addTextCrumb(pht('Edit User'), '/people/edit/');
- $crumbs->addTextCrumb($user->getFullName(), $base_uri);
- } else {
- $user = new PhabricatorUser();
- $base_uri = '/people/edit/';
- $crumbs->addTextCrumb(pht('Create New User'), $base_uri);
- }
-
- $nav = new AphrontSideNavFilterView();
- $nav->setBaseURI(new PhutilURI($base_uri));
- $nav->addLabel(pht('User Information'));
- $nav->addFilter('basic', pht('Basic Information'));
- $nav->addFilter('profile',
- pht('View Profile'), '/p/'.$user->getUsername().'/');
- if (!$user->getID()) {
- $this->view = 'basic';
- }
-
- $view = $nav->selectFilter($this->view, 'basic');
+ $user = new PhabricatorUser();
+ $base_uri = '/people/edit/';
+ $crumbs->addTextCrumb(pht('Create New User'), $base_uri);
$content = array();
- if ($request->getStr('saved')) {
- $notice = new AphrontErrorView();
- $notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
- $notice->setTitle(pht('Changes Saved'));
- $notice->appendChild(
- phutil_tag('p', array(), pht('Your changes were saved.')));
- $content[] = $notice;
- }
-
- switch ($view) {
- case 'basic':
- $response = $this->processBasicRequest($user);
- break;
- default:
- return new Aphront404Response();
- }
-
+ $response = $this->processBasicRequest($user);
if ($response instanceof AphrontResponse) {
return $response;
}
$content[] = $response;
- if ($user->getID()) {
- $nav->appendChild($content);
- } else {
- $nav = $this->buildSideNavView();
- $nav->selectFilter('edit');
- $nav->appendChild($content);
- }
-
- $nav->setCrumbs($crumbs);
return $this->buildApplicationPage(
- $nav,
+ array(
+ $crumbs,
+ $content,
+ ),
array(
'title' => pht('Edit User'),
'device' => true,
@@ -102,23 +50,20 @@
$request = $this->getRequest();
if ($request->isFormPost()) {
$welcome_checked = $request->getInt('welcome');
- $is_new = !$user->getID();
-
- if ($is_new) {
- $user->setUsername($request->getStr('username'));
-
- $new_email = $request->getStr('email');
- if (!strlen($new_email)) {
- $errors[] = pht('Email is required.');
- $e_email = pht('Required');
- } else if (!PhabricatorUserEmail::isAllowedAddress($new_email)) {
- $e_email = pht('Invalid');
- $errors[] = PhabricatorUserEmail::describeAllowedAddresses();
- } else {
- $e_email = null;
- }
+ $user->setUsername($request->getStr('username'));
+
+ $new_email = $request->getStr('email');
+ if (!strlen($new_email)) {
+ $errors[] = pht('Email is required.');
+ $e_email = pht('Required');
+ } else if (!PhabricatorUserEmail::isAllowedAddress($new_email)) {
+ $e_email = pht('Invalid');
+ $errors[] = PhabricatorUserEmail::describeAllowedAddresses();
+ } else {
+ $e_email = null;
}
+
$user->setRealName($request->getStr('realname'));
if (!strlen($user->getUsername())) {
@@ -141,28 +86,21 @@
if (!$errors) {
try {
- if (!$is_new) {
- id(new PhabricatorUserEditor())
- ->setActor($admin)
- ->updateUser($user);
- } else {
- $email = id(new PhabricatorUserEmail())
- ->setAddress($new_email)
- ->setIsVerified(0);
+ $email = id(new PhabricatorUserEmail())
+ ->setAddress($new_email)
+ ->setIsVerified(0);
+
+ // Automatically approve the user, since an admin is creating them.
+ $user->setIsApproved(1);
- // Automatically approve the user, since an admin is creating them.
- $user->setIsApproved(1);
+ id(new PhabricatorUserEditor())
+ ->setActor($admin)
+ ->createNewUser($user, $email);
+ if ($request->getStr('role') == 'agent') {
id(new PhabricatorUserEditor())
->setActor($admin)
- ->createNewUser($user, $email);
-
- if ($request->getStr('role') == 'agent') {
- id(new PhabricatorUserEditor())
- ->setActor($admin)
- ->makeSystemAgentUser($user, true);
- }
-
+ ->makeSystemAgentUser($user, true);
}
if ($welcome_checked) {
@@ -170,7 +108,7 @@
}
$response = id(new AphrontRedirectResponse())
- ->setURI('/people/edit/'.$user->getID().'/?saved=true');
+ ->setURI('/p/'.$user->getUsername().'/');
return $response;
} catch (AphrontQueryDuplicateKeyException $ex) {
$errors[] = pht('Username and email must be unique.');
@@ -193,17 +131,9 @@
$form = new AphrontFormView();
$form->setUser($admin);
- if ($user->getID()) {
- $form->setAction('/people/edit/'.$user->getID().'/');
- } else {
- $form->setAction('/people/edit/');
- }
+ $form->setAction('/people/edit/');
- if ($user->getID()) {
- $is_immutable = true;
- } else {
- $is_immutable = false;
- }
+ $is_immutable = false;
$form
->appendChild(
@@ -220,100 +150,46 @@
->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(
+ id(new AphrontFormTextControl())
+ ->setLabel(pht('Email'))
+ ->setName('email')
+ ->setDisabled($is_immutable)
+ ->setValue($new_email)
+ ->setCaption(PhabricatorUserEmail::describeAllowedAddresses())
+ ->setError($e_email));
$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 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));
$form
->appendChild(
id(new AphrontFormSubmitControl())
+ ->addCancelButton($this->getApplicationURI())
->setValue(pht('Save')));
- if ($user->getID()) {
- $title = pht('Edit User');
- } else {
- $title = pht('Create New User');
- }
+ $title = pht('Create New User');
$form_box = id(new PHUIObjectBoxView())
->setHeaderText($title)
diff --git a/src/applications/people/controller/PhabricatorPeopleEmpowerController.php b/src/applications/people/controller/PhabricatorPeopleEmpowerController.php
--- a/src/applications/people/controller/PhabricatorPeopleEmpowerController.php
+++ b/src/applications/people/controller/PhabricatorPeopleEmpowerController.php
@@ -21,7 +21,7 @@
return new Aphront404Response();
}
- $profile_uri = '/p/'.$user->getUsername();
+ $profile_uri = '/p/'.$user->getUsername().'/';
if ($user->getPHID() == $admin->getPHID()) {
return $this->newDialog()
diff --git a/src/applications/people/controller/PhabricatorPeopleListController.php b/src/applications/people/controller/PhabricatorPeopleListController.php
--- a/src/applications/people/controller/PhabricatorPeopleListController.php
+++ b/src/applications/people/controller/PhabricatorPeopleListController.php
@@ -99,11 +99,6 @@
->setName(pht('Approve'))
->setWorkflow(true)
->setHref($this->getApplicationURI('approve/'.$user_id.'/')));
- } else {
- $item->addAction(
- id(new PHUIListItemView())
- ->setIcon('edit')
- ->setHref($this->getApplicationURI('edit/'.$user_id.'/')));
}
}
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
@@ -121,9 +121,10 @@
$actions->addAction(
id(new PhabricatorActionView())
- ->setIcon('blame')
- ->setName(pht('Administrate User'))
- ->setHref($this->getApplicationURI('edit/'.$user->getID().'/')));
+ ->setIcon('message')
+ ->setName(pht('Send Welcome Email'))
+ ->setWorkflow(true)
+ ->setHref($this->getApplicationURI('welcome/'.$user->getID().'/')));
}
$properties = $this->buildPropertyView($user, $actions);
diff --git a/src/applications/people/controller/PhabricatorPeopleRenameController.php b/src/applications/people/controller/PhabricatorPeopleRenameController.php
--- a/src/applications/people/controller/PhabricatorPeopleRenameController.php
+++ b/src/applications/people/controller/PhabricatorPeopleRenameController.php
@@ -21,7 +21,7 @@
return new Aphront404Response();
}
- $profile_uri = '/p/'.$user->getUsername();
+ $profile_uri = '/p/'.$user->getUsername().'/';
$errors = array();
@@ -75,8 +75,12 @@
$inst4 = pht(
'Users who rely on password authentication will need to reset their '.
'password after their username is changed (their username is part of '.
- 'the salt in the password hash). They will receive an email with '.
- 'instructions on how to do this.');
+ 'the salt in the password hash).');
+
+ $inst5 = pht(
+ 'The user will receive an email notifying them that you changed their '.
+ 'username, with instructions for logging in and resetting their '.
+ 'password if necessary.');
$form = id(new AphrontFormView())
->setUser($admin)
@@ -103,6 +107,7 @@
->appendParagraph($inst2)
->appendParagraph($inst3)
->appendParagraph($inst4)
+ ->appendParagraph($inst5)
->appendParagraph(null)
->appendChild($form->buildLayoutView())
->addSubmitButton(pht('Rename User'))
diff --git a/src/applications/people/controller/PhabricatorPeopleWelcomeController.php b/src/applications/people/controller/PhabricatorPeopleWelcomeController.php
new file mode 100644
--- /dev/null
+++ b/src/applications/people/controller/PhabricatorPeopleWelcomeController.php
@@ -0,0 +1,50 @@
+<?php
+
+final class PhabricatorPeopleWelcomeController
+ extends PhabricatorPeopleController {
+
+ private $id;
+
+ public function willProcessRequest(array $data) {
+ $this->id = $data['id'];
+ }
+
+ public function processRequest() {
+ $request = $this->getRequest();
+ $admin = $request->getUser();
+
+ $user = id(new PhabricatorPeopleQuery())
+ ->setViewer($admin)
+ ->withIDs(array($this->id))
+ ->executeOne();
+ if (!$user) {
+ return new Aphront404Response();
+ }
+
+ $profile_uri = '/p/'.$user->getUsername().'/';
+
+ if ($request->isFormPost()) {
+ $user->sendWelcomeEmail($admin);
+ return id(new AphrontRedirectResponse())->setURI($profile_uri);
+ }
+
+ return $this->newDialog()
+ ->setTitle(pht('Send Welcome Email'))
+ ->appendParagraph(
+ pht(
+ 'This will send the user another copy of the "Welcome to '.
+ 'Phabricator" email that users normally receive when their '.
+ 'accounts are created.'))
+ ->appendParagraph(
+ pht(
+ 'The email contains a link to log in to their account. Sending '.
+ 'another copy of the email can be useful if the original was lost '.
+ 'or never sent.'))
+ ->appendParagraph(
+ pht(
+ 'The email will identify you as the sender.'))
+ ->addSubmitButton(pht('Send Email'))
+ ->addCancelButton($profile_uri);
+ }
+
+}
diff --git a/src/applications/settings/controller/PhabricatorSettingsMainController.php b/src/applications/settings/controller/PhabricatorSettingsMainController.php
--- a/src/applications/settings/controller/PhabricatorSettingsMainController.php
+++ b/src/applications/settings/controller/PhabricatorSettingsMainController.php
@@ -51,7 +51,6 @@
$key = $nav->selectFilter($this->key, head($panels)->getPanelKey());
-
$panel = $panels[$key];
$panel->setUser($this->getUser());
$panel->setViewer($viewer);

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 5, 2:00 PM (6 d, 11 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7225716
Default Alt Text
D8670.id20558.diff (18 KB)

Event Timeline

Phabricator · Built by Phacility