revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-04-08 10:28:29 +02:00
Code Issues Releases Wiki Activity

Remove needBadges from PhabricatorUser

Browse source 
Summary: Ref T12270. We don't really need these, timeline does it's own thing, badges is now a profile page, and hovercards have been removed.

Test Plan: Visit timeline, still see badges, visit my profile page, bask in the warmth of fake awards.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T12270

Differential Revision: https://secure.phabricator.com/D17448
This commit is contained in:
Chad Little 2017-03-01 19:06:54 -08:00
parent 664d9fa3ed
commit 08b18ac5f5
2 changed files with 10 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/applications/people/controller/PhabricatorPeopleProfileBadgesController.php
View file

@ -13,7 +13,6 @@ final class PhabricatorPeopleProfileBadgesController
->needProfile(true) ->needProfile(true)
->needProfileImage(true) ->needProfileImage(true)
->needAvailability(true) ->needAvailability(true)
->needBadges(true)
->requireCapabilities( ->requireCapabilities(
array( array(
PhabricatorPolicyCapability::CAN_VIEW, PhabricatorPolicyCapability::CAN_VIEW,
@ -82,21 +81,17 @@ final class PhabricatorPeopleProfileBadgesController
private function buildBadgesView(PhabricatorUser $user) { private function buildBadgesView(PhabricatorUser $user) {
$viewer = $this->getViewer(); $viewer = $this->getViewer();
$awards = array(); $awards = id(new PhabricatorBadgesAwardQuery())
$badges = array(); ->setViewer($viewer)
if ($user->getBadgePHIDs()) { ->withRecipientPHIDs(array($user->getPHID()))
$awards = id(new PhabricatorBadgesAwardQuery()) ->execute();
->setViewer($viewer) $awards = mpull($awards, null, 'getBadgePHID');
->withRecipientPHIDs(array($user->getPHID()))
->execute();
$awards = mpull($awards, null, 'getBadgePHID');
$badges = array(); $badges = array();
foreach ($awards as $award) { foreach ($awards as $award) {
$badge = $award->getBadge(); $badge = $award->getBadge();
if ($badge->getStatus() == PhabricatorBadgesBadge::STATUS_ACTIVE) { if ($badge->getStatus() == PhabricatorBadgesBadge::STATUS_ACTIVE) {
$badges[$award->getBadgePHID()] = $badge; $badges[$award->getBadgePHID()] = $badge;
}
} }
} }

21
src/applications/people/query/PhabricatorPeopleQuery.php
View file

@ -23,7 +23,6 @@ final class PhabricatorPeopleQuery
private $needProfile; private $needProfile;
private $needProfileImage; private $needProfileImage;
private $needAvailability; private $needAvailability;
private $needBadges;
private $cacheKeys = array(); private $cacheKeys = array();
public function withIDs(array $ids) { public function withIDs(array $ids) {
@ -128,11 +127,6 @@ final class PhabricatorPeopleQuery
return $this; return $this;
} }
public function needBadges($need) {
$this->needBadges = $need;
return $this;
}
public function needUserSettings($need) { public function needUserSettings($need) {
$cache_key = PhabricatorUserPreferencesCacheType::KEY_PREFERENCES; $cache_key = PhabricatorUserPreferencesCacheType::KEY_PREFERENCES;
@ -180,21 +174,6 @@ final class PhabricatorPeopleQuery
} }
} }
if ($this->needBadges) {
$awards = id(new PhabricatorBadgesAwardQuery())
->setViewer($this->getViewer())
->withRecipientPHIDs(mpull($users, 'getPHID'))
->execute();
$awards = mgroup($awards, 'getRecipientPHID');
foreach ($users as $user) {
$user_awards = idx($awards, $user->getPHID(), array());
$badge_phids = mpull($user_awards, 'getBadgePHID');
$user->attachBadgePHIDs($badge_phids);
}
}
if ($this->needAvailability) { if ($this->needAvailability) {
$rebuild = array(); $rebuild = array();
foreach ($users as $user) { foreach ($users as $user) {