Skip to content

Commit 6ab3f06

Browse files
committed
Transactions - adding willRenderTimeline to handle tricky cases
Summary: Fixes T6693. Test Plan: Made a bunch of comments on a diff with differential, being sure to leave inlines here and there. This reproduced the issue in T6693. With this patch this issue no longer reproduces! Successfully "showed older changes" in Maniphest too. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin, epriestley Maniphest Tasks: T6693 Differential Revision: https://secure.phabricator.com/D10931
1 parent 20035fe commit 6ab3f06

File tree

48 files changed

+373
-19
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+373
-19
lines changed

resources/celerity/map.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@
421421
'rsrc/js/application/repository/repository-crossreference.js' => 'f9539603',
422422
'rsrc/js/application/search/behavior-reorder-queries.js' => 'e9581f08',
423423
'rsrc/js/application/slowvote/behavior-slowvote-embed.js' => 'd6f54db0',
424-
'rsrc/js/application/transactions/behavior-show-older-transactions.js' => 'c30ccda9',
424+
'rsrc/js/application/transactions/behavior-show-older-transactions.js' => '83458cbb',
425425
'rsrc/js/application/transactions/behavior-transaction-comment-form.js' => '9f7309fb',
426426
'rsrc/js/application/transactions/behavior-transaction-list.js' => '13c739ea',
427427
'rsrc/js/application/uiexample/JavelinViewExample.js' => 'd4a14807',
@@ -625,7 +625,7 @@
625625
'javelin-behavior-phabricator-reveal-content' => '60821bc7',
626626
'javelin-behavior-phabricator-search-typeahead' => '724b1247',
627627
'javelin-behavior-phabricator-show-all-transactions' => '7c273581',
628-
'javelin-behavior-phabricator-show-older-transactions' => 'c30ccda9',
628+
'javelin-behavior-phabricator-show-older-transactions' => '83458cbb',
629629
'javelin-behavior-phabricator-tooltips' => '3ee3408b',
630630
'javelin-behavior-phabricator-transaction-comment-form' => '9f7309fb',
631631
'javelin-behavior-phabricator-transaction-list' => '13c739ea',
@@ -1375,6 +1375,12 @@
13751375
'82ce2142' => array(
13761376
'aphront-typeahead-control-css',
13771377
),
1378+
'83458cbb' => array(
1379+
'javelin-behavior',
1380+
'javelin-stratcom',
1381+
'javelin-dom',
1382+
'phabricator-busy',
1383+
),
13781384
'84845b5b' => array(
13791385
'javelin-behavior',
13801386
'javelin-dom',
@@ -1668,12 +1674,6 @@
16681674
'javelin-util',
16691675
'phabricator-shaped-request',
16701676
),
1671-
'c30ccda9' => array(
1672-
'javelin-behavior',
1673-
'javelin-stratcom',
1674-
'javelin-dom',
1675-
'phabricator-busy',
1676-
),
16771677
'c4569c05' => array(
16781678
'javelin-magical-init',
16791679
'javelin-install',

src/applications/almanac/storage/AlmanacBinding.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,11 @@ public function getApplicationTransactionTemplate() {
184184
return new AlmanacBindingTransaction();
185185
}
186186

187+
public function willRenderTimeline(
188+
PhabricatorApplicationTransactionView $timeline,
189+
AphrontRequest $request) {
190+
191+
return $timeline;
192+
}
193+
187194
}

src/applications/almanac/storage/AlmanacDevice.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,13 @@ public function getApplicationTransactionTemplate() {
162162
return new AlmanacDeviceTransaction();
163163
}
164164

165+
public function willRenderTimeline(
166+
PhabricatorApplicationTransactionView $timeline,
167+
AphrontRequest $request) {
168+
169+
return $timeline;
170+
}
171+
165172

166173
/* -( PhabricatorSSHPublicKeyInterface )----------------------------------- */
167174

src/applications/almanac/storage/AlmanacNetwork.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ public function getApplicationTransactionTemplate() {
5959
return new AlmanacNetworkTransaction();
6060
}
6161

62+
public function willRenderTimeline(
63+
PhabricatorApplicationTransactionView $timeline,
64+
AphrontRequest $request) {
65+
66+
return $timeline;
67+
}
68+
6269

6370
/* -( PhabricatorPolicyInterface )----------------------------------------- */
6471

src/applications/almanac/storage/AlmanacService.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,4 +161,11 @@ public function getApplicationTransactionTemplate() {
161161
return new AlmanacServiceTransaction();
162162
}
163163

164+
public function willRenderTimeline(
165+
PhabricatorApplicationTransactionView $timeline,
166+
AphrontRequest $request) {
167+
168+
return $timeline;
169+
}
170+
164171
}

src/applications/auth/storage/PhabricatorAuthProviderConfig.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,13 @@ public function getApplicationTransactionTemplate() {
9797
return new PhabricatorAuthProviderConfigTransaction();
9898
}
9999

100+
public function willRenderTimeline(
101+
PhabricatorApplicationTransactionView $timeline,
102+
AphrontRequest $request) {
103+
104+
return $timeline;
105+
}
106+
100107

101108
/* -( PhabricatorPolicyInterface )----------------------------------------- */
102109

src/applications/base/controller/PhabricatorController.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,8 @@ public function newDialog() {
529529
protected function buildTransactionTimeline(
530530
PhabricatorApplicationTransactionInterface $object,
531531
PhabricatorApplicationTransactionQuery $query,
532-
PhabricatorMarkupEngine $engine = null) {
532+
PhabricatorMarkupEngine $engine = null,
533+
$render_data = array()) {
533534

534535
$viewer = $this->getRequest()->getUser();
535536
$xaction = $object->getApplicationTransactionTemplate();
@@ -564,7 +565,9 @@ protected function buildTransactionTimeline(
564565
->setUser($viewer)
565566
->setObjectPHID($object->getPHID())
566567
->setTransactions($xactions)
567-
->setPager($pager);
568+
->setPager($pager)
569+
->setRenderData($render_data);
570+
$object->willRenderTimeline($timeline, $this->getRequest());
568571

569572
return $timeline;
570573
}

src/applications/config/storage/PhabricatorConfigEntry.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@ public function getApplicationTransactionTemplate() {
6868
return new PhabricatorConfigTransaction();
6969
}
7070

71+
public function willRenderTimeline(
72+
PhabricatorApplicationTransactionView $timeline,
73+
AphrontRequest $request) {
74+
75+
return $timeline;
76+
}
77+
7178

7279
/* -( PhabricatorPolicyInterface )----------------------------------------- */
7380

src/applications/dashboard/storage/PhabricatorDashboard.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,13 @@ public function getApplicationTransactionTemplate() {
9999
return new PhabricatorDashboardTransaction();
100100
}
101101

102+
public function willRenderTimeline(
103+
PhabricatorApplicationTransactionView $timeline,
104+
AphrontRequest $request) {
105+
106+
return $timeline;
107+
}
108+
102109

103110
/* -( PhabricatorPolicyInterface )----------------------------------------- */
104111

src/applications/dashboard/storage/PhabricatorDashboardPanel.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,13 @@ public function getApplicationTransactionTemplate() {
105105
return new PhabricatorDashboardPanelTransaction();
106106
}
107107

108+
public function willRenderTimeline(
109+
PhabricatorApplicationTransactionView $timeline,
110+
AphrontRequest $request) {
111+
112+
return $timeline;
113+
}
114+
108115

109116
/* -( PhabricatorPolicyInterface )----------------------------------------- */
110117

0 commit comments

Comments
 (0)