Page MenuHomePhabricator
Files F15400565

D8804.id20886.diff
No OneTemporary
Actions

D8804.id20886.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
@@ -7,7 +7,7 @@
return array(
'names' =>
array(
- 'core.pkg.css' => '030f12e5',
+ 'core.pkg.css' => '98b5fffe',
'core.pkg.js' => '417722ff',
'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => '12c11318',
@@ -34,7 +34,7 @@
'rsrc/css/aphront/table-view.css' => 'de599000',
'rsrc/css/aphront/tokenizer.css' => '36903077',
'rsrc/css/aphront/tooltip.css' => '9c90229d',
- 'rsrc/css/aphront/transaction.css' => 'ce491938',
+ 'rsrc/css/aphront/transaction.css' => '20b37dca',
'rsrc/css/aphront/two-column.css' => '16ab3ad2',
'rsrc/css/aphront/typeahead.css' => '271456a1',
'rsrc/css/application/auth/auth.css' => '1e655982',
@@ -717,7 +717,7 @@
'phabricator-standard-page-view' => '517cdfb1',
'phabricator-textareautils' => 'b3ec3cfc',
'phabricator-tooltip' => '3915d490',
- 'phabricator-transaction-view-css' => 'ce491938',
+ 'phabricator-transaction-view-css' => '20b37dca',
'phabricator-ui-example-css' => '4741b891',
'phabricator-uiexample-javelin-view' => 'd4a14807',
'phabricator-uiexample-reactor-button' => '44524435',
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -661,6 +661,11 @@
$herald_xactions = $this->applyHeraldRules($object, $xactions);
if ($herald_xactions) {
+ $xscript_id = $this->getHeraldTranscript()->getID();
+ foreach ($herald_xactions as $herald_xaction) {
+ $herald_xaction->setMetadataValue('herald:transcriptID', $xscript_id);
+ }
+
// NOTE: We're acting as the omnipotent user because rules deal with
// their own policy issues. We use a synthetic author PHID (the
// Herald application) as the author of record, so that transactions
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -757,6 +757,21 @@
return true;
}
+ public function renderExtraInformationLink() {
+ $herald_xscript_id = $this->getMetadataValue('herald:transcriptID');
+
+ if ($herald_xscript_id) {
+ return phutil_tag(
+ 'a',
+ array(
+ 'href' => '/herald/transcript/'.$herald_xscript_id.'/',
+ ),
+ pht('View Herald Transcript'));
+ }
+
+ return null;
+ }
+
/* -( PhabricatorPolicyInterface Implementation )-------------------------- */
diff --git a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
--- a/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationTransactionView.php
@@ -190,6 +190,22 @@
pht('(Show Details)'));
}
+ private function buildExtraInformationLink(
+ PhabricatorApplicationTransaction $xaction) {
+
+ $link = $xaction->renderExtraInformationLink();
+ if (!$link) {
+ return null;
+ }
+
+ return phutil_tag(
+ 'span',
+ array(
+ 'class' => 'phabricator-transaction-extra-information',
+ ),
+ array(" \xC2\xB7 ", $link));
+ }
+
protected function shouldGroupTransactions(
PhabricatorApplicationTransaction $u,
PhabricatorApplicationTransaction $v) {
@@ -313,6 +329,14 @@
);
}
}
+
+ if (!$this->isPreview) {
+ $more = $this->buildExtraInformationLink($xaction);
+ if ($more) {
+ $title = array($title, ' ', $more);
+ }
+ }
+
$event->setTitle($title);
}
diff --git a/webroot/rsrc/css/aphront/transaction.css b/webroot/rsrc/css/aphront/transaction.css
--- a/webroot/rsrc/css/aphront/transaction.css
+++ b/webroot/rsrc/css/aphront/transaction.css
@@ -61,3 +61,8 @@
div.phabricator-remarkup + .phabricator-transaction-subheader {
margin-top: 12px;
}
+
+.phui-timeline-title .phabricator-transaction-extra-information a {
+ font-weight: normal;
+ color: {$bluetext};
+}

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 18, 12:33 PM (4 d, 2 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7377715
Default Alt Text
D8804.id20886.diff (4 KB)

Event Timeline

Phabricator · Built by Phacility