mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-10 00:42:41 +01:00
Minor improvements to email management interface
Summary: - If you have an unverified primary email, we show a disabled "Primary" button right now in the "Status" column. Instead we should show an enabled "Verify" button, to allow you to re-send the verification email. - Sort addresses in a predictable way. Test Plan: - Added, verified and removed a secondary email address. - Resent verification email for primary address. - Changed primary address. Reviewers: btrahan, csilvers Reviewed By: btrahan CC: aran Maniphest Tasks: T1184 Differential Revision: https://secure.phabricator.com/D2548
This commit is contained in:
parent
65710ee2d2
commit
e12961802b
1 changed files with 45 additions and 35 deletions
|
@ -51,50 +51,60 @@ final class PhabricatorUserEmailSettingsPanelController
|
|||
}
|
||||
|
||||
$emails = id(new PhabricatorUserEmail())->loadAllWhere(
|
||||
'userPHID = %s',
|
||||
'userPHID = %s ORDER BY address',
|
||||
$user->getPHID());
|
||||
|
||||
$rowc = array();
|
||||
$rows = array();
|
||||
foreach ($emails as $email) {
|
||||
|
||||
$button_verify = javelin_render_tag(
|
||||
'a',
|
||||
array(
|
||||
'class' => 'button small grey',
|
||||
'href' => $uri->alter('verify', $email->getID()),
|
||||
'sigil' => 'workflow',
|
||||
),
|
||||
'Verify');
|
||||
|
||||
$button_make_primary = javelin_render_tag(
|
||||
'a',
|
||||
array(
|
||||
'class' => 'button small grey',
|
||||
'href' => $uri->alter('primary', $email->getID()),
|
||||
'sigil' => 'workflow',
|
||||
),
|
||||
'Make Primary');
|
||||
|
||||
$button_remove = javelin_render_tag(
|
||||
'a',
|
||||
array(
|
||||
'class' => 'button small grey',
|
||||
'href' => $uri->alter('delete', $email->getID()),
|
||||
'sigil' => 'workflow'
|
||||
),
|
||||
'Remove');
|
||||
|
||||
$button_primary = phutil_render_tag(
|
||||
'a',
|
||||
array(
|
||||
'class' => 'button small disabled',
|
||||
),
|
||||
'Primary');
|
||||
|
||||
if (!$email->getIsVerified()) {
|
||||
$action = $button_verify;
|
||||
} else if ($email->getIsPrimary()) {
|
||||
$action = $button_primary;
|
||||
} else {
|
||||
$action = $button_make_primary;
|
||||
}
|
||||
|
||||
if ($email->getIsPrimary()) {
|
||||
$action = phutil_render_tag(
|
||||
'a',
|
||||
array(
|
||||
'class' => 'button small disabled',
|
||||
),
|
||||
'Primary');
|
||||
$remove = $action;
|
||||
$remove = $button_primary;
|
||||
$rowc[] = 'highlighted';
|
||||
} else {
|
||||
if ($email->getIsVerified()) {
|
||||
$action = javelin_render_tag(
|
||||
'a',
|
||||
array(
|
||||
'class' => 'button small grey',
|
||||
'href' => $uri->alter('primary', $email->getID()),
|
||||
'sigil' => 'workflow',
|
||||
),
|
||||
'Make Primary');
|
||||
} else {
|
||||
$action = javelin_render_tag(
|
||||
'a',
|
||||
array(
|
||||
'class' => 'button small grey',
|
||||
'href' => $uri->alter('verify', $email->getID()),
|
||||
'sigil' => 'workflow',
|
||||
),
|
||||
'Verify');
|
||||
}
|
||||
$remove = javelin_render_tag(
|
||||
'a',
|
||||
array(
|
||||
'class' => 'button small grey',
|
||||
'href' => $uri->alter('delete', $email->getID()),
|
||||
'sigil' => 'workflow'
|
||||
),
|
||||
'Remove');
|
||||
$remove = $button_remove;
|
||||
$rowc[] = null;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue