Page MenuHomePhabricator
Files F13297613

D8571.diff
No OneTemporary
Actions

D8571.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
return array(
'names' =>
array(
- 'core.pkg.css' => 'b548faff',
+ 'core.pkg.css' => '4d72eb6e',
'core.pkg.js' => '264721e1',
'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => 'cb97e095',
@@ -141,7 +141,7 @@
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
'rsrc/css/phui/phui-list.css' => '2edb76cf',
'rsrc/css/phui/phui-object-box.css' => 'ce92d8ec',
- 'rsrc/css/phui/phui-object-item-list-view.css' => 'a8131782',
+ 'rsrc/css/phui/phui-object-item-list-view.css' => 'bde610d2',
'rsrc/css/phui/phui-pinboard-view.css' => '4b346c2a',
'rsrc/css/phui/phui-property-list-view.css' => 'dbf53b12',
'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
@@ -758,7 +758,7 @@
'phui-info-panel-css' => '27ea50a1',
'phui-list-view-css' => '2edb76cf',
'phui-object-box-css' => 'ce92d8ec',
- 'phui-object-item-list-view-css' => 'a8131782',
+ 'phui-object-item-list-view-css' => 'bde610d2',
'phui-pinboard-view-css' => '4b346c2a',
'phui-property-list-view-css' => 'dbf53b12',
'phui-remarkup-preview-css' => '19ad512b',
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
@@ -53,16 +53,14 @@
$email = pht('Unverified');
}
- $user_handle = new PhabricatorObjectHandle();
- $user_handle->setImageURI($user->loadProfileImageURI());
-
$item = new PHUIObjectItemView();
$item->setHeader($user->getFullName())
->setHref('/p/'.$user->getUsername().'/')
->addAttribute(hsprintf('%s %s',
phabricator_date($user->getDateCreated(), $viewer),
phabricator_time($user->getDateCreated(), $viewer)))
- ->addAttribute($email);
+ ->addAttribute($email)
+ ->setImageURI($user->getProfileImageURI());
if ($user->getIsDisabled()) {
$item->addIcon('disable', pht('Disabled'));
diff --git a/src/applications/people/query/PhabricatorPeopleSearchEngine.php b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
--- a/src/applications/people/query/PhabricatorPeopleSearchEngine.php
+++ b/src/applications/people/query/PhabricatorPeopleSearchEngine.php
@@ -26,7 +26,8 @@
public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
$query = id(new PhabricatorPeopleQuery())
- ->needPrimaryEmail(true);
+ ->needPrimaryEmail(true)
+ ->needProfileImage(true);
$usernames = $saved->getParameter('usernames', array());
if ($usernames) {
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
@@ -32,7 +32,7 @@
protected $isEmailVerified = 0;
protected $isApproved = 0;
- private $profileImage = null;
+ private $profileImage = self::ATTACHABLE;
private $profile = null;
private $status = self::ATTACHABLE;
private $preferences = null;
@@ -647,8 +647,12 @@
return $this;
}
+ public function getProfileImageURI() {
+ return $this->assertAttached($this->profileImage);
+ }
+
public function loadProfileImageURI() {
- if ($this->profileImage) {
+ if ($this->profileImage && $this->profileImage !== self::ATTACHABLE) {
return $this->profileImage;
}
diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css
--- a/webroot/rsrc/css/phui/phui-object-item-list-view.css
+++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css
@@ -572,7 +572,7 @@
.phui-object-item-image {
width: 50px;
height: 50px;
- margin: 4px 4px 4px 8px;
+ margin: 4px 4px 4px 4px;
position: absolute;
background-color: {$lightbluebackground};
}
@@ -582,5 +582,5 @@
}
.phui-object-item-with-image .phui-object-item-content-box {
- margin-left: 58px;
+ margin-left: 54px;
}

File Metadata

Mime Type
text/plain
Expires
Sat, Jun 8, 5:45 AM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6277255
Default Alt Text
D8571.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility