@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Update Fund for EditEngine commenting
Summary: Ref T12685. Moves Fund to EditEngine commenting.
Test Plan: View an old Fund, leave a comment, add a subscriber.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Maniphest Tasks: T12685
Differential Revision: https://secure.phabricator.com/D17857
+10
-87
-2
src/__phutil_library_map__.php
-2
src/__phutil_library_map__.php
···
1138
1138
'FundInitiativeBackController' => 'applications/fund/controller/FundInitiativeBackController.php',
1139
1139
'FundInitiativeBackerTransaction' => 'applications/fund/xaction/FundInitiativeBackerTransaction.php',
1140
1140
'FundInitiativeCloseController' => 'applications/fund/controller/FundInitiativeCloseController.php',
1141
-
'FundInitiativeCommentController' => 'applications/fund/controller/FundInitiativeCommentController.php',
1142
1141
'FundInitiativeDescriptionTransaction' => 'applications/fund/xaction/FundInitiativeDescriptionTransaction.php',
1143
1142
'FundInitiativeEditController' => 'applications/fund/controller/FundInitiativeEditController.php',
1144
1143
'FundInitiativeEditEngine' => 'applications/fund/editor/FundInitiativeEditEngine.php',
···
6103
6102
'FundInitiativeBackController' => 'FundController',
6104
6103
'FundInitiativeBackerTransaction' => 'FundInitiativeTransactionType',
6105
6104
'FundInitiativeCloseController' => 'FundController',
6106
-
'FundInitiativeCommentController' => 'FundController',
6107
6105
'FundInitiativeDescriptionTransaction' => 'FundInitiativeTransactionType',
6108
6106
'FundInitiativeEditController' => 'FundController',
6109
6107
'FundInitiativeEditEngine' => 'PhabricatorEditEngine',
-1
src/applications/fund/application/PhabricatorFundApplication.php
-1
src/applications/fund/application/PhabricatorFundApplication.php
···
42
42
'/fund/' => array(
43
43
'(?:query/(?P<queryKey>[^/]+)/)?' => 'FundInitiativeListController',
44
44
'create/' => 'FundInitiativeEditController',
45
-
'comment/(?P<id>[1-9]\d*)/' => 'FundInitiativeCommentController',
46
45
$this->getEditRoutePattern('edit/')
47
46
=> 'FundInitiativeEditController',
48
47
'close/(?P<id>\d+)/' => 'FundInitiativeCloseController',
-63
src/applications/fund/controller/FundInitiativeCommentController.php
-63
src/applications/fund/controller/FundInitiativeCommentController.php
···
1
-
<?php
2
-
3
-
final class FundInitiativeCommentController
4
-
extends FundController {
5
-
6
-
public function handleRequest(AphrontRequest $request) {
7
-
$viewer = $request->getViewer();
8
-
$id = $request->getURIData('id');
9
-
10
-
if (!$request->isFormPost()) {
11
-
return new Aphront400Response();
12
-
}
13
-
14
-
$initiative = id(new FundInitiativeQuery())
15
-
->setViewer($viewer)
16
-
->withIDs(array($id))
17
-
->executeOne();
18
-
if (!$initiative) {
19
-
return new Aphront404Response();
20
-
}
21
-
22
-
$is_preview = $request->isPreviewRequest();
23
-
$draft = PhabricatorDraft::buildFromRequest($request);
24
-
25
-
$view_uri = '/'.$initiative->getMonogram();
26
-
27
-
$xactions = array();
28
-
$xactions[] = id(new FundInitiativeTransaction())
29
-
->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
30
-
->attachComment(
31
-
id(new FundInitiativeTransactionComment())
32
-
->setContent($request->getStr('comment')));
33
-
34
-
$editor = id(new FundInitiativeEditor())
35
-
->setActor($viewer)
36
-
->setContinueOnNoEffect($request->isContinueRequest())
37
-
->setContentSourceFromRequest($request)
38
-
->setIsPreview($is_preview);
39
-
40
-
try {
41
-
$xactions = $editor->applyTransactions($initiative, $xactions);
42
-
} catch (PhabricatorApplicationTransactionNoEffectException $ex) {
43
-
return id(new PhabricatorApplicationTransactionNoEffectResponse())
44
-
->setCancelURI($view_uri)
45
-
->setException($ex);
46
-
}
47
-
48
-
if ($draft) {
49
-
$draft->replaceOrDelete();
50
-
}
51
-
52
-
if ($request->isAjax() && $is_preview) {
53
-
return id(new PhabricatorApplicationTransactionResponse())
54
-
->setViewer($viewer)
55
-
->setTransactions($xactions)
56
-
->setIsPreview($is_preview);
57
-
} else {
58
-
return id(new AphrontRedirectResponse())
59
-
->setURI($view_uri);
60
-
}
61
-
}
62
-
63
-
}
+9
-20
src/applications/fund/controller/FundInitiativeViewController.php
+9
-20
src/applications/fund/controller/FundInitiativeViewController.php
···
52
52
$timeline = $this->buildTransactionTimeline(
53
53
$initiative,
54
54
new FundInitiativeTransactionQuery());
55
+
$timeline->setQuoteRef($initiative->getMonogram());
55
56
56
-
$add_comment = $this->buildCommentForm($initiative);
57
+
$comment_view = $this->buildCommentForm($initiative, $timeline);
57
58
58
59
$view = id(new PHUITwoColumnView())
59
60
->setHeader($header)
60
61
->setCurtain($curtain)
61
62
->setMainColumn(array(
62
63
$timeline,
63
-
$add_comment,
64
+
$comment_view,
64
65
))
65
66
->addPropertySection(pht('Details'), $details);
66
67
···
164
165
return $curtain;
165
166
}
166
167
167
-
private function buildCommentForm(FundInitiative $initiative) {
168
+
private function buildCommentForm(FundInitiative $initiative, $timeline) {
168
169
$viewer = $this->getViewer();
169
-
170
-
$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
171
-
172
-
$add_comment_header = $is_serious
173
-
? pht('Add Comment')
174
-
: pht('Add Liquidity');
175
-
176
-
$draft = PhabricatorDraft::newFromUserAndKey(
177
-
$viewer, $initiative->getPHID());
170
+
$box = id(new FundInitiativeEditEngine())
171
+
->setViewer($viewer)
172
+
->buildEditEngineCommentView($initiative)
173
+
->setTransactionTimeline($timeline);
178
174
179
-
return id(new PhabricatorApplicationTransactionCommentView())
180
-
->setUser($viewer)
181
-
->setObjectPHID($initiative->getPHID())
182
-
->setDraft($draft)
183
-
->setHeaderText($add_comment_header)
184
-
->setAction(
185
-
$this->getApplicationURI('/comment/'.$initiative->getID().'/'))
186
-
->setSubmitButtonName(pht('Add Comment'));
175
+
return $box;
187
176
}
188
177
189
178