Page MenuHomePhabricator
Files F13183113

D9901.id23947.diff
No OneTemporary
Actions

D9901.id23947.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -392,7 +392,7 @@
'rsrc/js/application/files/behavior-icon-composer.js' => '8ef9ab58',
'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
'rsrc/js/application/harbormaster/behavior-reorder-steps.js' => 'b716477f',
- 'rsrc/js/application/herald/HeraldRuleEditor.js' => '58e048fc',
+ 'rsrc/js/application/herald/HeraldRuleEditor.js' => '3fc2c8f2',
'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
'rsrc/js/application/maniphest/behavior-batch-editor.js' => 'f588412e',
@@ -543,7 +543,7 @@
'global-drag-and-drop-css' => '697324ad',
'harbormaster-css' => 'cec833b7',
'herald-css' => 'c544dd1c',
- 'herald-rule-editor' => '58e048fc',
+ 'herald-rule-editor' => '3fc2c8f2',
'herald-test-css' => '778b008e',
'inline-comment-summary-css' => '8cfd34e8',
'javelin-aphlict' => '4a07e8e3',
@@ -1103,6 +1103,15 @@
2 => 'javelin-stratcom',
3 => 'phabricator-tooltip',
),
+ '3fc2c8f2' => array(
+ 0 => 'multirow-row-manager',
+ 1 => 'javelin-install',
+ 2 => 'javelin-util',
+ 3 => 'javelin-dom',
+ 4 => 'javelin-stratcom',
+ 5 => 'javelin-json',
+ 6 => 'phabricator-prefab',
+ ),
'40a6a403' => array(
0 => 'javelin-install',
1 => 'javelin-dom',
@@ -1199,15 +1208,6 @@
2 => 'javelin-vector',
3 => 'javelin-dom',
),
- '58e048fc' => array(
- 0 => 'multirow-row-manager',
- 1 => 'javelin-install',
- 2 => 'javelin-util',
- 3 => 'javelin-dom',
- 4 => 'javelin-stratcom',
- 5 => 'javelin-json',
- 6 => 'phabricator-prefab',
- ),
'58f7803f' => array(
0 => 'javelin-behavior',
1 => 'javelin-aphlict',
diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
--- a/src/applications/herald/controller/HeraldRuleController.php
+++ b/src/applications/herald/controller/HeraldRuleController.php
@@ -601,7 +601,12 @@
'userorproject' => new PhabricatorProjectOrUserDatasource(),
);
- $sources = mpull($sources, 'getDatasourceURI');
+ foreach ($sources as $key => $source) {
+ $sources[$key] = array(
+ 'uri' => $source->getDatasourceURI(),
+ 'placeholder' => $source->getPlaceholderText(),
+ );
+ }
return array(
'source' => $sources,
diff --git a/webroot/rsrc/js/application/herald/HeraldRuleEditor.js b/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
--- a/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
+++ b/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
@@ -283,7 +283,8 @@
var tokenizerConfig = {
root : template,
- src : this._config.template.source[type],
+ src : this._config.template.source[type].uri,
+ placeholder: this._config.template.source[type].placeholder,
icons : this._config.template.icons,
username : this._config.username
};

File Metadata

Mime Type
text/plain
Expires
Sat, May 11, 6:58 AM (1 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6275822
Default Alt Text
D9901.id23947.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility