Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15431318
D15103.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
15 KB
Referenced Files
None
Subscribers
None
D15103.id.diff
View Options
diff --git a/resources/sql/autopatches/20160124.people.1.icon.sql b/resources/sql/autopatches/20160124.people.1.icon.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20160124.people.1.icon.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_user.user_profile
+ ADD icon VARCHAR(32) NOT NULL COLLATE {$COLLATE_TEXT};
diff --git a/resources/sql/autopatches/20160124.people.2.icondefault.sql b/resources/sql/autopatches/20160124.people.2.icondefault.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20160124.people.2.icondefault.sql
@@ -0,0 +1,2 @@
+UPDATE {$NAMESPACE}_user.user_profile
+ SET icon = 'person' WHERE icon = '';
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
@@ -2737,6 +2737,7 @@
'PhabricatorPeopleEmpowerController' => 'applications/people/controller/PhabricatorPeopleEmpowerController.php',
'PhabricatorPeopleExternalPHIDType' => 'applications/people/phid/PhabricatorPeopleExternalPHIDType.php',
'PhabricatorPeopleHovercardEngineExtension' => 'applications/people/engineextension/PhabricatorPeopleHovercardEngineExtension.php',
+ 'PhabricatorPeopleIconSet' => 'applications/people/icon/PhabricatorPeopleIconSet.php',
'PhabricatorPeopleInviteController' => 'applications/people/controller/PhabricatorPeopleInviteController.php',
'PhabricatorPeopleInviteListController' => 'applications/people/controller/PhabricatorPeopleInviteListController.php',
'PhabricatorPeopleInviteSendController' => 'applications/people/controller/PhabricatorPeopleInviteSendController.php',
@@ -3366,6 +3367,7 @@
'PhabricatorUserEmail' => 'applications/people/storage/PhabricatorUserEmail.php',
'PhabricatorUserEmailTestCase' => 'applications/people/storage/__tests__/PhabricatorUserEmailTestCase.php',
'PhabricatorUserFulltextEngine' => 'applications/people/search/PhabricatorUserFulltextEngine.php',
+ 'PhabricatorUserIconField' => 'applications/people/customfield/PhabricatorUserIconField.php',
'PhabricatorUserLog' => 'applications/people/storage/PhabricatorUserLog.php',
'PhabricatorUserLogView' => 'applications/people/view/PhabricatorUserLogView.php',
'PhabricatorUserPHIDResolver' => 'applications/phid/resolver/PhabricatorUserPHIDResolver.php',
@@ -7102,6 +7104,7 @@
'PhabricatorPeopleEmpowerController' => 'PhabricatorPeopleController',
'PhabricatorPeopleExternalPHIDType' => 'PhabricatorPHIDType',
'PhabricatorPeopleHovercardEngineExtension' => 'PhabricatorHovercardEngineExtension',
+ 'PhabricatorPeopleIconSet' => 'PhabricatorIconSet',
'PhabricatorPeopleInviteController' => 'PhabricatorPeopleController',
'PhabricatorPeopleInviteListController' => 'PhabricatorPeopleInviteController',
'PhabricatorPeopleInviteSendController' => 'PhabricatorPeopleInviteController',
@@ -7853,6 +7856,7 @@
'PhabricatorUserEmail' => 'PhabricatorUserDAO',
'PhabricatorUserEmailTestCase' => 'PhabricatorTestCase',
'PhabricatorUserFulltextEngine' => 'PhabricatorFulltextEngine',
+ 'PhabricatorUserIconField' => 'PhabricatorUserCustomField',
'PhabricatorUserLog' => array(
'PhabricatorUserDAO',
'PhabricatorPolicyInterface',
diff --git a/src/applications/people/config/PhabricatorUserConfigOptions.php b/src/applications/people/config/PhabricatorUserConfigOptions.php
--- a/src/applications/people/config/PhabricatorUserConfigOptions.php
+++ b/src/applications/people/config/PhabricatorUserConfigOptions.php
@@ -24,6 +24,7 @@
$default = array(
id(new PhabricatorUserRealNameField())->getFieldKey() => true,
id(new PhabricatorUserTitleField())->getFieldKey() => true,
+ id(new PhabricatorUserIconField())->getFieldKey() => true,
id(new PhabricatorUserSinceField())->getFieldKey() => true,
id(new PhabricatorUserRolesField())->getFieldKey() => true,
id(new PhabricatorUserStatusField())->getFieldKey() => true,
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
--- a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
@@ -27,9 +27,14 @@
$profile = $user->loadUserProfile();
$picture = $user->getProfileImageURI();
+ $profile_icon = PhabricatorPeopleIconSet::getIconIcon($profile->getIcon());
+ $profile_icon = id(new PHUIIconView())
+ ->setIconFont($profile_icon.' grey');
+ $profile_title = $profile->getDisplayTitle();
+
$header = id(new PHUIHeaderView())
->setHeader($user->getFullName())
- ->setSubheader($profile->getTitle())
+ ->setSubheader(array($profile_icon, $profile_title))
->setImage($picture);
$actions = id(new PhabricatorActionListView())
diff --git a/src/applications/people/customfield/PhabricatorUserTitleField.php b/src/applications/people/customfield/PhabricatorUserIconField.php
copy from src/applications/people/customfield/PhabricatorUserTitleField.php
copy to src/applications/people/customfield/PhabricatorUserIconField.php
--- a/src/applications/people/customfield/PhabricatorUserTitleField.php
+++ b/src/applications/people/customfield/PhabricatorUserIconField.php
@@ -1,20 +1,20 @@
<?php
-final class PhabricatorUserTitleField
+final class PhabricatorUserIconField
extends PhabricatorUserCustomField {
private $value;
public function getFieldKey() {
- return 'user:title';
+ return 'user:icon';
}
public function getFieldName() {
- return pht('Title');
+ return pht('Icon');
}
public function getFieldDescription() {
- return pht('User title, like "CEO" or "Assistant to the Manager".');
+ return pht('User icon to accompany their title.');
}
public function canDisableField() {
@@ -30,11 +30,11 @@
}
public function readValueFromObject(PhabricatorCustomFieldInterface $object) {
- $this->value = $object->loadUserProfile()->getTitle();
+ $this->value = $object->loadUserProfile()->getIcon();
}
public function getOldValueForApplicationTransactions() {
- return $this->getObject()->loadUserProfile()->getTitle();
+ return $this->getObject()->loadUserProfile()->getIcon();
}
public function getNewValueForApplicationTransactions() {
@@ -43,7 +43,7 @@
public function applyApplicationTransactionInternalEffects(
PhabricatorApplicationTransaction $xaction) {
- $this->getObject()->loadUserProfile()->setTitle($xaction->getNewValue());
+ $this->getObject()->loadUserProfile()->setIcon($xaction->getNewValue());
}
public function readValueFromRequest(AphrontRequest $request) {
@@ -51,11 +51,11 @@
}
public function renderEditControl(array $handles) {
- return id(new AphrontFormTextControl())
+ return id(new PHUIFormIconSetControl())
->setName($this->getFieldKey())
->setValue($this->value)
->setLabel($this->getFieldName())
- ->setCaption(pht('Serious business title.'));
+ ->setIconSet(new PhabricatorPeopleIconSet());
}
}
diff --git a/src/applications/people/customfield/PhabricatorUserTitleField.php b/src/applications/people/customfield/PhabricatorUserTitleField.php
--- a/src/applications/people/customfield/PhabricatorUserTitleField.php
+++ b/src/applications/people/customfield/PhabricatorUserTitleField.php
@@ -54,8 +54,7 @@
return id(new AphrontFormTextControl())
->setName($this->getFieldKey())
->setValue($this->value)
- ->setLabel($this->getFieldName())
- ->setCaption(pht('Serious business title.'));
+ ->setLabel($this->getFieldName());
}
}
diff --git a/src/applications/people/icon/PhabricatorPeopleIconSet.php b/src/applications/people/icon/PhabricatorPeopleIconSet.php
new file mode 100644
--- /dev/null
+++ b/src/applications/people/icon/PhabricatorPeopleIconSet.php
@@ -0,0 +1,120 @@
+<?php
+
+final class PhabricatorPeopleIconSet
+ extends PhabricatorIconSet {
+
+ const ICONSETKEY = 'people';
+
+ public function getSelectIconTitleText() {
+ return pht('Choose User Icon');
+ }
+
+ protected function newIcons() {
+ $specifications = self::getIconSpecifications();
+
+ $icons = array();
+ foreach ($specifications as $spec) {
+ $icons[] = id(new PhabricatorIconSetIcon())
+ ->setKey($spec['key'])
+ ->setIcon($spec['icon'])
+ ->setLabel($spec['name']);
+ }
+
+ return $icons;
+ }
+
+ public static function getDefaultIconKey() {
+ $specifications = self::getIconSpecifications();
+
+ foreach ($specifications as $spec) {
+ if (idx($spec, 'default')) {
+ return $spec['key'];
+ }
+ }
+
+ return null;
+ }
+
+ public static function getIconIcon($key) {
+ $specifications = self::getIconSpecifications();
+ $map = ipull($specifications, 'icon', 'key');
+ return idx($map, $key);
+ }
+
+ public static function getIconName($key) {
+ $specifications = self::getIconSpecifications();
+ $map = ipull($specifications, 'name', 'key');
+ return idx($map, $key);
+ }
+
+ private static function getIconSpecifications() {
+ return self::getDefaultSpecifications();
+ }
+
+ private static function getDefaultSpecifications() {
+ return array(
+ array(
+ 'key' => 'person',
+ 'icon' => 'fa-user',
+ 'name' => pht('User'),
+ 'default' => true,
+ ),
+ array(
+ 'key' => 'engineering',
+ 'icon' => 'fa-code',
+ 'name' => pht('Engineering'),
+ ),
+ array(
+ 'key' => 'operations',
+ 'icon' => 'fa-space-shuttle',
+ 'name' => pht('Operations'),
+ ),
+ array(
+ 'key' => 'resources',
+ 'icon' => 'fa-heart',
+ 'name' => pht('Resources'),
+ ),
+ array(
+ 'key' => 'relationships',
+ 'icon' => 'fa-glass',
+ 'name' => pht('Relationships'),
+ ),
+ array(
+ 'key' => 'administration',
+ 'icon' => 'fa-fax',
+ 'name' => pht('Administration'),
+ ),
+ array(
+ 'key' => 'security',
+ 'icon' => 'fa-shield',
+ 'name' => pht('Security'),
+ ),
+ array(
+ 'key' => 'logistics',
+ 'icon' => 'fa-truck',
+ 'name' => pht('Logistics'),
+ ),
+ array(
+ 'key' => 'research',
+ 'icon' => 'fa-flask',
+ 'name' => pht('Research'),
+ ),
+ array(
+ 'key' => 'analysis',
+ 'icon' => 'fa-bar-chart-o',
+ 'name' => pht('Analysis'),
+ ),
+ array(
+ 'key' => 'executive',
+ 'icon' => 'fa-angle-double-up',
+ 'name' => pht('Executive'),
+ ),
+ array(
+ 'key' => 'animal',
+ 'icon' => 'fa-paw',
+ 'name' => pht('Animal'),
+ ),
+ );
+ }
+
+}
diff --git a/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
--- a/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
+++ b/src/applications/people/phid/PhabricatorPeopleUserPHIDType.php
@@ -26,6 +26,7 @@
return id(new PhabricatorPeopleQuery())
->withPHIDs($phids)
+ ->needProfile(true)
->needProfileImage(true)
->needAvailability(true);
}
@@ -46,6 +47,15 @@
if ($user->getIsMailingList()) {
$handle->setIcon('fa-envelope-o');
+ $handle->setSubtitle(pht('Mailing List'));
+ } else {
+ $profile = $user->getUserProfile();
+ $icon_key = $profile->getIcon();
+ $icon_icon = PhabricatorPeopleIconSet::getIconIcon($icon_key);
+ $subtitle = $profile->getDisplayTitle();
+
+ $handle->setIcon($icon_icon);
+ $handle->setSubtitle($subtitle);
}
$availability = null;
diff --git a/src/applications/people/query/PhabricatorPeopleQuery.php b/src/applications/people/query/PhabricatorPeopleQuery.php
--- a/src/applications/people/query/PhabricatorPeopleQuery.php
+++ b/src/applications/people/query/PhabricatorPeopleQuery.php
@@ -138,15 +138,16 @@
if ($this->needProfile) {
$user_list = mpull($users, null, 'getPHID');
$profiles = new PhabricatorUserProfile();
- $profiles = $profiles->loadAllWhere('userPHID IN (%Ls)',
+ $profiles = $profiles->loadAllWhere(
+ 'userPHID IN (%Ls)',
array_keys($user_list));
$profiles = mpull($profiles, null, 'getUserPHID');
foreach ($user_list as $user_phid => $user) {
$profile = idx($profiles, $user_phid);
+
if (!$profile) {
- $profile = new PhabricatorUserProfile();
- $profile->setUserPHID($user_phid);
+ $profile = PhabricatorUserProfile::initializeNewProfile($user);
}
$user->attachUserProfile($profile);
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -451,8 +451,7 @@
$this->getPHID());
if (!$this->profile) {
- $profile_dao->setUserPHID($this->getPHID());
- $this->profile = $profile_dao;
+ $this->profile = PhabricatorUserProfile::initializeNewProfile($this);
}
return $this->profile;
diff --git a/src/applications/people/storage/PhabricatorUserProfile.php b/src/applications/people/storage/PhabricatorUserProfile.php
--- a/src/applications/people/storage/PhabricatorUserProfile.php
+++ b/src/applications/people/storage/PhabricatorUserProfile.php
@@ -6,6 +6,15 @@
protected $title;
protected $blurb;
protected $profileImagePHID;
+ protected $icon;
+
+ public static function initializeNewProfile(PhabricatorUser $user) {
+ $default_icon = PhabricatorPeopleIconSet::getDefaultIconKey();
+
+ return id(new self())
+ ->setUserPHID($user->getPHID())
+ ->setIcon($default_icon);
+ }
protected function getConfiguration() {
return array(
@@ -13,6 +22,7 @@
'title' => 'text255',
'blurb' => 'text',
'profileImagePHID' => 'phid?',
+ 'icon' => 'text32',
),
self::CONFIG_KEY_SCHEMA => array(
'userPHID' => array(
@@ -23,4 +33,14 @@
) + parent::getConfiguration();
}
+ public function getDisplayTitle() {
+ $title = $this->getTitle();
+ if (strlen($title)) {
+ return $title;
+ }
+
+ $icon_key = $this->getIcon();
+ return PhabricatorPeopleIconSet::getIconName($icon_key);
+ }
+
}
diff --git a/src/applications/phid/PhabricatorObjectHandle.php b/src/applications/phid/PhabricatorObjectHandle.php
--- a/src/applications/phid/PhabricatorObjectHandle.php
+++ b/src/applications/phid/PhabricatorObjectHandle.php
@@ -27,6 +27,7 @@
private $complete;
private $objectName;
private $policyFiltered;
+ private $subtitle;
public function setIcon($icon) {
$this->icon = $icon;
@@ -44,6 +45,15 @@
return $this->getTypeIcon();
}
+ public function setSubtitle($subtitle) {
+ $this->subtitle = $subtitle;
+ return $this;
+ }
+
+ public function getSubtitle() {
+ return $this->subtitle;
+ }
+
public function setTagColor($color) {
static $colors;
if (!$colors) {
diff --git a/src/applications/project/view/PhabricatorProjectUserListView.php b/src/applications/project/view/PhabricatorProjectUserListView.php
--- a/src/applications/project/view/PhabricatorProjectUserListView.php
+++ b/src/applications/project/view/PhabricatorProjectUserListView.php
@@ -79,6 +79,13 @@
->setHref($handle->getURI())
->setImageURI($handle->getImageURI());
+ $icon = id(new PHUIIconView())
+ ->setIconFont($handle->getIcon().' grey');
+
+ $subtitle = $handle->getSubtitle();
+
+ $item->addAttribute(array($icon, ' ', $subtitle));
+
if ($can_edit && !$limit) {
$remove_uri = $this->getRemoveURI($user_phid);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Mar 25, 11:44 AM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7696199
Default Alt Text
D15103.id.diff (15 KB)
Attached To
Mode
D15103: Allow users to have profile icons
Attached
Detach File
Event Timeline
Log In to Comment