Page MenuHomePhabricator
Files F15379107

D18554.diff
No OneTemporary
Actions

D18554.diff
View Options

diff --git a/src/applications/fund/query/FundInitiativeQuery.php b/src/applications/fund/query/FundInitiativeQuery.php
--- a/src/applications/fund/query/FundInitiativeQuery.php
+++ b/src/applications/fund/query/FundInitiativeQuery.php
@@ -8,8 +8,6 @@
private $ownerPHIDs;
private $statuses;
- private $needProjectPHIDs;
-
public function withIDs(array $ids) {
$this->ids = $ids;
return $this;
@@ -30,11 +28,6 @@
return $this;
}
- public function needProjectPHIDs($need) {
- $this->needProjectPHIDs = $need;
- return $this;
- }
-
public function newResultObject() {
return new FundInitiative();
}
@@ -43,29 +36,6 @@
return $this->loadStandardPage($this->newResultObject());
}
- protected function didFilterPage(array $initiatives) {
-
- if ($this->needProjectPHIDs) {
- $edge_query = id(new PhabricatorEdgeQuery())
- ->withSourcePHIDs(mpull($initiatives, 'getPHID'))
- ->withEdgeTypes(
- array(
- PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
- ));
- $edge_query->execute();
-
- foreach ($initiatives as $initiative) {
- $phids = $edge_query->getDestinationPHIDs(
- array(
- $initiative->getPHID(),
- ));
- $initiative->attachProjectPHIDs($phids);
- }
- }
-
- return $initiatives;
- }
-
protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
$where = parent::buildWhereClauseParts($conn);
diff --git a/src/applications/fund/query/FundInitiativeSearchEngine.php b/src/applications/fund/query/FundInitiativeSearchEngine.php
--- a/src/applications/fund/query/FundInitiativeSearchEngine.php
+++ b/src/applications/fund/query/FundInitiativeSearchEngine.php
@@ -11,67 +11,37 @@
return 'PhabricatorFundApplication';
}
- public function buildSavedQueryFromRequest(AphrontRequest $request) {
- $saved = new PhabricatorSavedQuery();
-
- $saved->setParameter(
- 'ownerPHIDs',
- $this->readUsersFromRequest($request, 'owners'));
-
- $saved->setParameter(
- 'statuses',
- $this->readListFromRequest($request, 'statuses'));
+ public function newQuery() {
+ return new FundInitiativeQuery();
+ }
- return $saved;
+ protected function buildCustomSearchFields() {
+ return array(
+ id(new PhabricatorUsersSearchField())
+ ->setKey('ownerPHIDs')
+ ->setAliases(array('owner', 'ownerPHID', 'owners'))
+ ->setLabel(pht('Owners')),
+ id(new PhabricatorSearchCheckboxesField())
+ ->setKey('statuses')
+ ->setLabel(pht('Statuses'))
+ ->setOptions(FundInitiative::getStatusNameMap()),
+ );
}
- public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
- $query = id(new FundInitiativeQuery())
- ->needProjectPHIDs(true);
+ protected function buildQueryFromParameters(array $map) {
+ $query = $this->newQuery();
- $owner_phids = $saved->getParameter('ownerPHIDs');
- if ($owner_phids) {
- $query->withOwnerPHIDs($owner_phids);
+ if ($map['ownerPHIDs']) {
+ $query->withOwnerPHIDs($map['ownerPHIDs']);
}
- $statuses = $saved->getParameter('statuses');
- if ($statuses) {
- $query->withStatuses($statuses);
+ if ($map['statuses']) {
+ $query->withStatuses($map['statuses']);
}
return $query;
}
- public function buildSearchForm(
- AphrontFormView $form,
- PhabricatorSavedQuery $saved) {
-
- $statuses = $saved->getParameter('statuses', array());
- $statuses = array_fuse($statuses);
-
- $owner_phids = $saved->getParameter('ownerPHIDs', array());
-
- $status_map = FundInitiative::getStatusNameMap();
- $status_control = id(new AphrontFormCheckboxControl())
- ->setLabel(pht('Statuses'));
- foreach ($status_map as $status => $name) {
- $status_control->addCheckbox(
- 'statuses[]',
- $status,
- $name,
- isset($statuses[$status]));
- }
-
- $form
- ->appendControl(
- id(new AphrontFormTokenizerControl())
- ->setLabel(pht('Owners'))
- ->setName('owners')
- ->setDatasource(new PhabricatorPeopleDatasource())
- ->setValue($owner_phids))
- ->appendChild($status_control);
- }
-
protected function getURI($path) {
return '/fund/'.$path;
}
@@ -112,21 +82,6 @@
return parent::buildSavedQueryFromBuiltin($query_key);
}
- protected function getRequiredHandlePHIDsForResultList(
- array $initiatives,
- PhabricatorSavedQuery $query) {
-
- $phids = array();
- foreach ($initiatives as $initiative) {
- $phids[] = $initiative->getOwnerPHID();
- foreach ($initiative->getProjectPHIDs() as $project_phid) {
- $phids[] = $project_phid;
- }
- }
-
- return $phids;
- }
-
protected function renderResultList(
array $initiatives,
PhabricatorSavedQuery $query,
@@ -135,7 +90,30 @@
$viewer = $this->requireViewer();
- $list = id(new PHUIObjectItemListView());
+ $load_phids = array();
+ foreach ($initiatives as $initiative) {
+ $load_phids[] = $initiative->getOwnerPHID();
+ }
+
+ if ($initiatives) {
+ $edge_query = id(new PhabricatorEdgeQuery())
+ ->withSourcePHIDs(mpull($initiatives, 'getPHID'))
+ ->withEdgeTypes(
+ array(
+ PhabricatorProjectObjectHasProjectEdgeType::EDGECONST,
+ ));
+
+ $edge_query->execute();
+
+ foreach ($edge_query->getDestinationPHIDs() as $phid) {
+ $load_phids[] = $phid;
+ }
+ }
+
+ $handles = $viewer->loadHandles($load_phids);
+ $handles = iterator_to_array($handles);
+
+ $list = new PHUIObjectItemListView();
foreach ($initiatives as $initiative) {
$owner_handle = $handles[$initiative->getOwnerPHID()];
@@ -149,9 +127,12 @@
$item->setDisabled(true);
}
- $project_handles = array_select_keys(
- $handles,
- $initiative->getProjectPHIDs());
+ $project_phids = $edge_query->getDestinationPHIDs(
+ array(
+ $initiative->getPHID(),
+ ));
+
+ $project_handles = array_select_keys($handles, $project_phids);
if ($project_handles) {
$item->addAttribute(
id(new PHUIHandleTagListView())
@@ -168,9 +149,6 @@
$result->setNoDataString(pht('No initiatives found.'));
return $result;
-
-
- return $list;
}
}

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 14, 6:44 PM (7 h, 10 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7666255
Default Alt Text
D18554.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility