Page MenuHomestyx hydra
Files F273421

No OneTemporary
Actions

View Options

diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
index 1dadcbc1cf..eb1da608e3 100644
--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
@@ -1,59 +1,127 @@
<?php
final class ManiphestTaskSearchEngine
extends PhabricatorApplicationSearchEngine {
public function buildSavedQueryFromRequest(AphrontRequest $request) {
$saved = new PhabricatorSavedQuery();
+ $saved->setParameter(
+ 'assignedPHIDs',
+ $this->readUsersFromRequest($request, 'assigned'));
+
+ $saved->setParameter('withUnassigned', $request->getBool('withUnassigned'));
+
+ $saved->setParameter(
+ 'authorPHIDs',
+ $this->readUsersFromRequest($request, 'authors'));
+
return $saved;
}
public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
$query = id(new ManiphestTaskQuery());
+ $author_phids = $saved->getParameter('authorPHIDs');
+ if ($author_phids) {
+ $query->withAuthors($author_phids);
+ }
+
+ $with_unassigned = $saved->getParameter('withUnassigned');
+ if ($with_unassigned) {
+ $query->withOwners(array(null));
+ } else {
+ $assigned_phids = $saved->getParameter('assignedPHIDs', array());
+ if ($assigned_phids) {
+ $query->withOwners($assigned_phids);
+ }
+ }
return $query;
}
public function buildSearchForm(
AphrontFormView $form,
- PhabricatorSavedQuery $saved_query) {
+ PhabricatorSavedQuery $saved) {
+
+ $assigned_phids = $saved->getParameter('assignedPHIDs', array());
+ $author_phids = $saved->getParameter('authorPHIDs', array());
+ $all_phids = array_merge($assigned_phids, $author_phids);
+
+ if ($all_phids) {
+ $handles = id(new PhabricatorHandleQuery())
+ ->setViewer($this->requireViewer())
+ ->withPHIDs($all_phids)
+ ->execute();
+ } else {
+ $handles = array();
+ }
+
+ $assigned_tokens = array_select_keys($handles, $assigned_phids);
+ $assigned_tokens = mpull($assigned_tokens, 'getFullName', 'getPHID');
+
+ $author_tokens = array_select_keys($handles, $author_phids);
+ $author_tokens = mpull($author_tokens, 'getFullName', 'getPHID');
+
+ $with_unassigned = $saved->getParameter('withUnassigned');
+
+ $form
+ ->appendChild(
+ id(new AphrontFormTokenizerControl())
+ ->setDatasource('/typeahead/common/accounts/')
+ ->setName('assigned')
+ ->setLabel(pht('Assigned To'))
+ ->setValue($assigned_tokens))
+ ->appendChild(
+ id(new AphrontFormCheckboxControl())
+ ->addCheckbox(
+ 'withUnassigned',
+ 1,
+ pht('Show only unassigned tasks.'),
+ $with_unassigned))
+ ->appendChild(
+ id(new AphrontFormTokenizerControl())
+ ->setDatasource('/typeahead/common/accounts/')
+ ->setName('authors')
+ ->setLabel(pht('Authors'))
+ ->setValue($author_tokens));
}
protected function getURI($path) {
return '/maniphest/'.$path;
}
public function getBuiltinQueryNames() {
$names = array();
if ($this->requireViewer()->isLoggedIn()) {
$names['assigned'] = pht('Assigned');
$names['authored'] = pht('Authored');
}
$names['all'] = pht('All Tasks');
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 'assigned':
- return $query;
+ return $query->setParameter('assignedPHIDs', array($viewer_phid));
case 'authored':
- return $query;
+ return $query->setParameter('authorPHIDs', array($viewer_phid));
}
return parent::buildSavedQueryFromBuiltin($query_key);
}
}

File Metadata

Mime Type
text/x-diff
Expires
Fri, Aug 15, 6:06 AM (6 d, 4 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
202400
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!)