revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 00:42:41 +01:00
Code Issues Releases Wiki Activity

Minor improvements to email management interface

Browse source 
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:
epriestley 2012-05-23 12:55:07 -07:00
parent 65710ee2d2
commit e12961802b
1 changed files with 45 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/applications/people/controller/settings/panels/email/PhabricatorUserEmailSettingsPanelController.php
View file

@ -51,34 +51,14 @@ 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) {
if ($email->getIsPrimary()) {
$action = phutil_render_tag(
'a',
array(
'class' => 'button small disabled',
),
'Primary');
$remove = $action;
$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(
$button_verify = javelin_render_tag(
'a',
array(
'class' => 'button small grey',
@ -86,8 +66,17 @@ final class PhabricatorUserEmailSettingsPanelController
'sigil' => 'workflow',
),
'Verify');
}
$remove = javelin_render_tag(
$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',
@ -95,6 +84,27 @@ final class PhabricatorUserEmailSettingsPanelController
'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()) {
$remove = $button_primary;
$rowc[] = 'highlighted';
} else {
$remove = $button_remove;
$rowc[] = null;
}