Page MenuHomestyx hydra
Files F501598

No OneTemporary
Actions

View Options

diff --git a/src/applications/owners/storage/PhabricatorOwnersOwner.php b/src/applications/owners/storage/PhabricatorOwnersOwner.php
index 07d5b59a20..ddca80b099 100644
--- a/src/applications/owners/storage/PhabricatorOwnersOwner.php
+++ b/src/applications/owners/storage/PhabricatorOwnersOwner.php
@@ -1,69 +1,81 @@
<?php
final class PhabricatorOwnersOwner extends PhabricatorOwnersDAO {
protected $packageID;
// this can be a project or a user. We assume that all members of a project
// owner also own the package; use the loadAffiliatedUserPHIDs method if
// you want to recursively grab all user ids that own a package
protected $userPHID;
protected function getConfiguration() {
return array(
self::CONFIG_TIMESTAMPS => false,
self::CONFIG_KEY_SCHEMA => array(
'packageID' => array(
'columns' => array('packageID', 'userPHID'),
'unique' => true,
),
'userPHID' => array(
'columns' => array('userPHID'),
),
),
) + parent::getConfiguration();
}
public static function loadAllForPackages(array $packages) {
assert_instances_of($packages, 'PhabricatorOwnersPackage');
if (!$packages) {
return array();
}
return id(new PhabricatorOwnersOwner())->loadAllWhere(
'packageID IN (%Ls)',
mpull($packages, 'getID'));
}
// Loads all user phids affiliated with a set of packages. This includes both
// user owners and all members of any project owners
public static function loadAffiliatedUserPHIDs(array $package_ids) {
if (!$package_ids) {
return array();
}
$owners = id(new PhabricatorOwnersOwner())->loadAllWhere(
'packageID IN (%Ls)',
$package_ids);
- $all_phids = phid_group_by_type(mpull($owners, 'getUserPHID'));
+ $type_user = PhabricatorPeopleUserPHIDType::TYPECONST;
+ $type_project = PhabricatorProjectProjectPHIDType::TYPECONST;
- $user_phids = idx($all_phids,
- PhabricatorPeopleUserPHIDType::TYPECONST,
- array());
+ $user_phids = array();
+ $project_phids = array();
+ foreach ($owners as $owner) {
+ $owner_phid = $owner->getUserPHID();
+ switch (phid_get_type($owner_phid)) {
+ case PhabricatorPeopleUserPHIDType::TYPECONST:
+ $user_phids[] = $owner_phid;
+ break;
+ case PhabricatorProjectProjectPHIDType::TYPECONST:
+ $project_phids[] = $owner_phid;
+ break;
+ }
+ }
- if ($user_phids) {
+ if ($project_phids) {
$projects = id(new PhabricatorProjectQuery())
->setViewer(PhabricatorUser::getOmnipotentUser())
- ->withMemberPHIDs($user_phids)
- ->withIsMilestone(false)
+ ->withPHIDs($project_phids)
+ ->needMembers(true)
->execute();
- $project_phids = mpull($projects, 'getPHID');
- } else {
- $project_phids = array();
+ foreach ($projects as $project) {
+ foreach ($project->getMemberPHIDs() as $member_phid) {
+ $user_phids[] = $member_phid;
+ }
+ }
}
- $all_phids = array_fuse($user_phids) + array_fuse($project_phids);
-
- return array_values($all_phids);
+ $user_phids = array_fuse($user_phids);
+ return array_values($user_phids);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Sun, Sep 7, 9:19 AM (1 d, 10 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
222888
Default Alt Text
(3 KB)

Event Timeline

styx copyright 2020 sirocyl / ellie (kymkdd) / ncommander / styx contributors
Use of other names and brands is not intended to reflect a claim of, or right to, use the name or brand.
styx is an operating system using the Linux kernel and components, and "styx Linux" as a phrase does not reflect the inclusion of the Linux brand or trademark in the styx project.
Linux® is the registered trademark of Linus Torvalds in the U.S. and other countries.
Terms and Conditions (TODO: fix this!)