@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Fix an issue with "packages(...)" in typeaheads
Summary:
Fixes T9302. This datasource wasn't resolving package PHIDs correctly for the actual query.
Also fixes an issue with the "Affected packages that need audit" Herald rule.
Test Plan: Ran a "Needs Audit" query with only packages, and only `packages(user)`.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T9302
Differential Revision: https://secure.phabricator.com/D14029
+17
-18
+10
-10
resources/celerity/map.php
+10
-10
resources/celerity/map.php
···
8
8
return array(
9
9
'names' => array(
10
10
'core.pkg.css' => '928faf7e',
11
-
'core.pkg.js' => 'a590b451',
11
+
'core.pkg.js' => '47dc9ebb',
12
12
'darkconsole.pkg.js' => 'e7393ebb',
13
13
'differential.pkg.css' => '2de124c9',
14
14
'differential.pkg.js' => '813c1633',
···
210
210
'rsrc/externals/javelin/ext/view/__tests__/ViewInterpreter.js' => '7a94d6a5',
211
211
'rsrc/externals/javelin/ext/view/__tests__/ViewRenderer.js' => '6ea96ac9',
212
212
'rsrc/externals/javelin/lib/Cookie.js' => '62dfea03',
213
-
'rsrc/externals/javelin/lib/DOM.js' => '147805fa',
213
+
'rsrc/externals/javelin/lib/DOM.js' => '805b806a',
214
214
'rsrc/externals/javelin/lib/History.js' => 'd4505101',
215
215
'rsrc/externals/javelin/lib/JSON.js' => '69adf288',
216
216
'rsrc/externals/javelin/lib/Leader.js' => '331b1611',
···
659
659
'javelin-color' => '7e41274a',
660
660
'javelin-cookie' => '62dfea03',
661
661
'javelin-diffusion-locate-file-source' => 'b42eddc7',
662
-
'javelin-dom' => '147805fa',
662
+
'javelin-dom' => '805b806a',
663
663
'javelin-dynval' => 'f6555212',
664
664
'javelin-event' => '85ea0626',
665
665
'javelin-fx' => '54b612ba',
···
918
918
'javelin-uri',
919
919
'phabricator-textareautils',
920
920
),
921
-
'147805fa' => array(
922
-
'javelin-magical-init',
923
-
'javelin-install',
924
-
'javelin-util',
925
-
'javelin-vector',
926
-
'javelin-stratcom',
927
-
),
928
921
'1499a8cb' => array(
929
922
'javelin-behavior',
930
923
'javelin-stratcom',
···
1450
1443
'7ee2b591' => array(
1451
1444
'javelin-behavior',
1452
1445
'javelin-history',
1446
+
),
1447
+
'805b806a' => array(
1448
+
'javelin-magical-init',
1449
+
'javelin-install',
1450
+
'javelin-util',
1451
+
'javelin-vector',
1452
+
'javelin-stratcom',
1453
1453
),
1454
1454
82439934 => array(
1455
1455
'javelin-behavior',
+1
-3
src/applications/diffusion/herald/HeraldCommitAdapter.php
+1
-3
src/applications/diffusion/herald/HeraldCommitAdapter.php
···
168
168
'commitPHID = %s AND auditStatus IN (%Ls)',
169
169
$this->commit->getPHID(),
170
170
$status_arr);
171
-
172
-
$packages = mpull($requests, 'getAuditorPHID');
173
-
$this->auditNeededPackages = $packages;
171
+
$this->auditNeededPackages = $requests;
174
172
}
175
173
return $this->auditNeededPackages;
176
174
}
+6
-5
src/applications/owners/typeahead/PhabricatorOwnersPackageOwnerDatasource.php
+6
-5
src/applications/owners/typeahead/PhabricatorOwnersPackageOwnerDatasource.php
···
62
62
$phids = $this->resolvePHIDs($phids);
63
63
64
64
$user_phids = array();
65
-
foreach ($phids as $phid) {
65
+
foreach ($phids as $key => $phid) {
66
66
if (phid_get_type($phid) == PhabricatorPeopleUserPHIDType::TYPECONST) {
67
67
$user_phids[] = $phid;
68
+
unset($phids[$key]);
68
69
}
69
70
}
70
71
71
72
if ($user_phids) {
72
-
$projects = id(new PhabricatorProjectQuery())
73
+
$packages = id(new PhabricatorOwnersPackageQuery())
73
74
->setViewer($this->getViewer())
74
-
->withMemberPHIDs($user_phids)
75
+
->withOwnerPHIDs($user_phids)
75
76
->execute();
76
-
foreach ($projects as $project) {
77
-
$phids[] = $project->getPHID();
77
+
foreach ($packages as $package) {
78
+
$phids[] = $package->getPHID();
78
79
}
79
80
}
80
81