Page MenuHomePhabricator
Files F13191999

D12527.id30074.diff
No OneTemporary
Actions

D12527.id30074.diff
View Options

diff --git a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
--- a/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
+++ b/src/applications/maniphest/query/ManiphestTaskSearchEngine.php
@@ -55,7 +55,7 @@
$saved->setParameter(
'subscriberPHIDs',
- $this->readPHIDsFromRequest($request, 'subscribers'));
+ $this->readSubscribersFromRequest($request, 'subscribers'));
$saved->setParameter(
'statuses',
@@ -111,12 +111,21 @@
$query = id(new ManiphestTaskQuery())
->needProjectPHIDs(true);
- $author_phids = $saved->getParameter('authorPHIDs');
+ $viewer = $this->requireViewer();
+
+ $datasource = id(new PhabricatorTypeaheadUserParameterizedDatasource())
+ ->setViewer($viewer);
+
+ $author_phids = $saved->getParameter('authorPHIDs', array());
+ $author_phids = $datasource->evaluateTokens($author_phids);
if ($author_phids) {
$query->withAuthors($author_phids);
}
- $subscriber_phids = $saved->getParameter('subscriberPHIDs');
+ $datasource = id(new PhabricatorMetaMTAMailableFunctionDatasource())
+ ->setViewer($viewer);
+ $subscriber_phids = $saved->getParameter('subscriberPHIDs', array());
+ $subscriber_phids = $datasource->evaluateTokens($subscriber_phids);
if ($subscriber_phids) {
$query->withSubscribers($subscriber_phids);
}
@@ -274,13 +283,13 @@
->setValue($projects))
->appendControl(
id(new AphrontFormTokenizerControl())
- ->setDatasource(new PhabricatorPeopleDatasource())
+ ->setDatasource(new PhabricatorTypeaheadUserParameterizedDatasource())
->setName('authors')
->setLabel(pht('Authors'))
->setValue($author_phids))
->appendControl(
id(new AphrontFormTokenizerControl())
- ->setDatasource(new PhabricatorMetaMTAMailableDatasource())
+ ->setDatasource(new PhabricatorMetaMTAMailableFunctionDatasource())
->setName('subscribers')
->setLabel(pht('Subscribers'))
->setValue($subscriber_phids))
diff --git a/src/applications/project/typeahead/PhabricatorProjectMembersDatasource.php b/src/applications/project/typeahead/PhabricatorProjectMembersDatasource.php
--- a/src/applications/project/typeahead/PhabricatorProjectMembersDatasource.php
+++ b/src/applications/project/typeahead/PhabricatorProjectMembersDatasource.php
@@ -41,6 +41,7 @@
$result
->setTokenType(PhabricatorTypeaheadTokenView::TYPE_FUNCTION)
->setIcon('fa-users')
+ ->setColor(null)
->setPHID('members('.$result->getPHID().')')
->setDisplayName(pht('Members: %s', $result->getDisplayName()))
->setName($result->getName().' members');

File Metadata

Mime Type
text/plain
Expires
Mon, May 13, 3:50 AM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6274861
Default Alt Text
D12527.id30074.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility