Page MenuHomePhabricator
Files F14025931

D12457.diff
No OneTemporary
Actions

D12457.diff
View Options

diff --git a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
--- a/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
+++ b/src/applications/typeahead/datasource/PhabricatorTypeaheadDatasource.php
@@ -199,6 +199,62 @@
->setTokenType(PhabricatorTypeaheadTokenView::TYPE_INVALID);
}
+ public function renderTokens(array $values) {
+ $phids = array();
+ $setup = array();
+ $tokens = array();
+
+ foreach ($values as $key => $value) {
+ if (!self::isFunctionToken($value)) {
+ $phids[$key] = $value;
+ } else {
+ $function = $this->parseFunction($value);
+ if ($function) {
+ $setup[$function['name']][$key] = $function;
+ } else {
+ $name = pht('Invalid Function: %s', $value);
+ $tokens[$key] = $this->newInvalidToken($name)
+ ->setKey($value);
+ }
+ }
+ }
+
+ if ($phids) {
+ $handles = $this->getViewer()->loadHandles($phids);
+ foreach ($phids as $key => $phid) {
+ $handle = $handles[$phid];
+ $tokens[$key] = PhabricatorTypeaheadTokenView::newFromHandle($handle);
+ }
+ }
+
+ if ($setup) {
+ foreach ($setup as $function_name => $argv_list) {
+ // Render the function tokens.
+ $function_tokens = $this->renderFunctionTokens(
+ $function_name,
+ ipull($argv_list, 'argv'));
+
+ // Rekey the function tokens using the original array keys.
+ $function_tokens = array_combine(
+ array_keys($argv_list),
+ $function_tokens);
+
+ // For any functions which were invalid, set their value to the
+ // original input value before it was parsed.
+ foreach ($function_tokens as $key => $token) {
+ $type = $token->getTokenType();
+ if ($type == PhabricatorTypeaheadTokenView::TYPE_INVALID) {
+ $token->setKey($values[$key]);
+ }
+ }
+
+ $tokens += $function_tokens;
+ }
+ }
+
+ return array_select_keys($tokens, array_keys($values));
+ }
+
/* -( Token Functions )---------------------------------------------------- */
diff --git a/src/view/form/control/AphrontFormTokenizerControl.php b/src/view/form/control/AphrontFormTokenizerControl.php
--- a/src/view/form/control/AphrontFormTokenizerControl.php
+++ b/src/view/form/control/AphrontFormTokenizerControl.php
@@ -62,34 +62,11 @@
$placeholder = $datasource->getPlaceholderText();
}
- $tokens = array();
$values = nonempty($this->getValue(), array());
- foreach ($values as $value) {
- if (isset($handles[$value])) {
- $token = PhabricatorTypeaheadTokenView::newFromHandle($handles[$value]);
- } else {
- $token = null;
-
- $function = $datasource->parseFunction($value);
- if ($function) {
- $token_list = $datasource->renderFunctionTokens(
- $function['name'],
- array($function['argv']));
- $token = head($token_list);
- }
-
- if (!$token) {
- $name = pht('Invalid Function: %s', $value);
- $token = $datasource->newInvalidToken($name);
- }
+ $tokens = $datasource->renderTokens($values);
- $type = $token->getTokenType();
- if ($type == PhabricatorTypeaheadTokenView::TYPE_INVALID) {
- $token->setKey($value);
- }
- }
+ foreach ($tokens as $token) {
$token->setInputName($this->getName());
- $tokens[] = $token;
}
$template = new AphrontTokenizerTemplateView();

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 8, 9:26 PM (1 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6713444
Default Alt Text
D12457.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility