mirror of
https://we.phorge.it/source/phorge.git
synced 2025-02-05 11:28:25 +01:00
f1c75a6382
Summary: Ref T3775 (discussion here). Ref T2625. T3775 presents two problems: # Existing tools which linked to `/differential/active/epriestley/` (that is, put a username in the URL) can't generate search links now. # Humans can't edit the URL anymore, either. I think (1) is an actual issue, and this fixes it. I think (2) is pretty fluff, and this doesn't really try to fix it, although it probably improves it. The fix for (1) is: - Provide a helper to read a parameter containing either a list of user PHIDs or a list of usernames, so `/?users[]=PHID-USER-xyz` (from a tokenizer) and `/?users=alincoln,htaft` (from an external program) are equivalent inputs. - Rename all the form parameters to be more digestable (`authorPHIDs` -> `authors`). Almost all of them were in this form already anyway. This just gives us `?users=alincoln` instead of `userPHIDs=alincoln`. - Inside ApplicationSearch, if a request has no query associated with it but does have query parameters, build a query from the request instead of issuing the user's default query. Basically, this means that `/differential/` runs the default query, while `/differential/?users=x` runs a custom query. Test Plan: {F56612} Reviewers: btrahan Reviewed By: btrahan CC: aran Maniphest Tasks: T2625, T3775 Differential Revision: https://secure.phabricator.com/D6840
114 lines
2.9 KiB
PHP
114 lines
2.9 KiB
PHP
<?php
|
|
|
|
final class PhabricatorProjectSearchEngine
|
|
extends PhabricatorApplicationSearchEngine {
|
|
|
|
public function buildSavedQueryFromRequest(AphrontRequest $request) {
|
|
$saved = new PhabricatorSavedQuery();
|
|
|
|
$saved->setParameter(
|
|
'memberPHIDs',
|
|
$this->readUsersFromRequest($request, 'members'));
|
|
$saved->setParameter('status', $request->getStr('status'));
|
|
|
|
return $saved;
|
|
}
|
|
|
|
public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
|
|
$query = id(new PhabricatorProjectQuery());
|
|
|
|
$member_phids = $saved->getParameter('memberPHIDs', array());
|
|
if ($member_phids && is_array($member_phids)) {
|
|
$query->withMemberPHIDs($member_phids);
|
|
}
|
|
|
|
$status = $saved->getParameter('status');
|
|
$status = idx($this->getStatusValues(), $status);
|
|
if ($status) {
|
|
$query->withStatus($status);
|
|
}
|
|
|
|
return $query;
|
|
}
|
|
|
|
public function buildSearchForm(
|
|
AphrontFormView $form,
|
|
PhabricatorSavedQuery $saved_query) {
|
|
|
|
$phids = $saved_query->getParameter('memberPHIDs', array());
|
|
$handles = id(new PhabricatorObjectHandleData($phids))
|
|
->setViewer($this->requireViewer())
|
|
->loadHandles();
|
|
$member_tokens = mpull($handles, 'getFullName', 'getPHID');
|
|
|
|
$status = $saved_query->getParameter('status');
|
|
|
|
$form
|
|
->appendChild(
|
|
id(new AphrontFormTokenizerControl())
|
|
->setDatasource('/typeahead/common/users/')
|
|
->setName('members')
|
|
->setLabel(pht('Members'))
|
|
->setValue($member_tokens))
|
|
->appendChild(
|
|
id(new AphrontFormSelectControl())
|
|
->setLabel(pht('Status'))
|
|
->setName('status')
|
|
->setOptions($this->getStatusOptions())
|
|
->setValue($status));
|
|
}
|
|
|
|
protected function getURI($path) {
|
|
return '/project/'.$path;
|
|
}
|
|
|
|
public function getBuiltinQueryNames() {
|
|
$names = array();
|
|
|
|
if ($this->requireViewer()->isLoggedIn()) {
|
|
$names['joined'] = pht('Joined');
|
|
}
|
|
|
|
$names['active'] = pht('Active');
|
|
$names['all'] = pht('All');
|
|
|
|
return $names;
|
|
}
|
|
|
|
public function buildSavedQueryFromBuiltin($query_key) {
|
|
|
|
$query = $this->newSavedQuery();
|
|
$query->setQueryKey($query_key);
|
|
|
|
$viewer_phid = $this->requireViewer()->getPHID();
|
|
|
|
switch ($query_key) {
|
|
case 'all':
|
|
return $query;
|
|
case 'active':
|
|
return $query
|
|
->setParameter('status', 'active');
|
|
case 'joined':
|
|
return $query
|
|
->setParameter('memberPHIDs', array($viewer_phid))
|
|
->setParameter('status', 'active');
|
|
}
|
|
|
|
return parent::buildSavedQueryFromBuiltin($query_key);
|
|
}
|
|
|
|
private function getStatusOptions() {
|
|
return array(
|
|
'active' => pht('Show Only Active Projects'),
|
|
'all' => pht('Show All Projects'),
|
|
);
|
|
}
|
|
|
|
private function getStatusValues() {
|
|
return array(
|
|
'active' => PhabricatorProjectQuery::STATUS_ACTIVE,
|
|
'all' => PhabricatorProjectQuery::STATUS_ANY,
|
|
);
|
|
}
|
|
|
|
}
|