Page MenuHomePhabricator
Files F13205808

D17857.diff
No OneTemporary
Actions

D17857.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1138,7 +1138,6 @@
'FundInitiativeBackController' => 'applications/fund/controller/FundInitiativeBackController.php',
'FundInitiativeBackerTransaction' => 'applications/fund/xaction/FundInitiativeBackerTransaction.php',
'FundInitiativeCloseController' => 'applications/fund/controller/FundInitiativeCloseController.php',
- 'FundInitiativeCommentController' => 'applications/fund/controller/FundInitiativeCommentController.php',
'FundInitiativeDescriptionTransaction' => 'applications/fund/xaction/FundInitiativeDescriptionTransaction.php',
'FundInitiativeEditController' => 'applications/fund/controller/FundInitiativeEditController.php',
'FundInitiativeEditEngine' => 'applications/fund/editor/FundInitiativeEditEngine.php',
@@ -6103,7 +6102,6 @@
'FundInitiativeBackController' => 'FundController',
'FundInitiativeBackerTransaction' => 'FundInitiativeTransactionType',
'FundInitiativeCloseController' => 'FundController',
- 'FundInitiativeCommentController' => 'FundController',
'FundInitiativeDescriptionTransaction' => 'FundInitiativeTransactionType',
'FundInitiativeEditController' => 'FundController',
'FundInitiativeEditEngine' => 'PhabricatorEditEngine',
diff --git a/src/applications/fund/application/PhabricatorFundApplication.php b/src/applications/fund/application/PhabricatorFundApplication.php
--- a/src/applications/fund/application/PhabricatorFundApplication.php
+++ b/src/applications/fund/application/PhabricatorFundApplication.php
@@ -42,7 +42,6 @@
'/fund/' => array(
'(?:query/(?P<queryKey>[^/]+)/)?' => 'FundInitiativeListController',
'create/' => 'FundInitiativeEditController',
- 'comment/(?P<id>[1-9]\d*)/' => 'FundInitiativeCommentController',
$this->getEditRoutePattern('edit/')
=> 'FundInitiativeEditController',
'close/(?P<id>\d+)/' => 'FundInitiativeCloseController',
diff --git a/src/applications/fund/controller/FundInitiativeCommentController.php b/src/applications/fund/controller/FundInitiativeCommentController.php
deleted file mode 100644
--- a/src/applications/fund/controller/FundInitiativeCommentController.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-final class FundInitiativeCommentController
- extends FundController {
-
- public function handleRequest(AphrontRequest $request) {
- $viewer = $request->getViewer();
- $id = $request->getURIData('id');
-
- if (!$request->isFormPost()) {
- return new Aphront400Response();
- }
-
- $initiative = id(new FundInitiativeQuery())
- ->setViewer($viewer)
- ->withIDs(array($id))
- ->executeOne();
- if (!$initiative) {
- return new Aphront404Response();
- }
-
- $is_preview = $request->isPreviewRequest();
- $draft = PhabricatorDraft::buildFromRequest($request);
-
- $view_uri = '/'.$initiative->getMonogram();
-
- $xactions = array();
- $xactions[] = id(new FundInitiativeTransaction())
- ->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
- ->attachComment(
- id(new FundInitiativeTransactionComment())
- ->setContent($request->getStr('comment')));
-
- $editor = id(new FundInitiativeEditor())
- ->setActor($viewer)
- ->setContinueOnNoEffect($request->isContinueRequest())
- ->setContentSourceFromRequest($request)
- ->setIsPreview($is_preview);
-
- try {
- $xactions = $editor->applyTransactions($initiative, $xactions);
- } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
- return id(new PhabricatorApplicationTransactionNoEffectResponse())
- ->setCancelURI($view_uri)
- ->setException($ex);
- }
-
- if ($draft) {
- $draft->replaceOrDelete();
- }
-
- if ($request->isAjax() && $is_preview) {
- return id(new PhabricatorApplicationTransactionResponse())
- ->setViewer($viewer)
- ->setTransactions($xactions)
- ->setIsPreview($is_preview);
- } else {
- return id(new AphrontRedirectResponse())
- ->setURI($view_uri);
- }
- }
-
-}
diff --git a/src/applications/fund/controller/FundInitiativeViewController.php b/src/applications/fund/controller/FundInitiativeViewController.php
--- a/src/applications/fund/controller/FundInitiativeViewController.php
+++ b/src/applications/fund/controller/FundInitiativeViewController.php
@@ -52,15 +52,16 @@
$timeline = $this->buildTransactionTimeline(
$initiative,
new FundInitiativeTransactionQuery());
+ $timeline->setQuoteRef($initiative->getMonogram());
- $add_comment = $this->buildCommentForm($initiative);
+ $comment_view = $this->buildCommentForm($initiative, $timeline);
$view = id(new PHUITwoColumnView())
->setHeader($header)
->setCurtain($curtain)
->setMainColumn(array(
$timeline,
- $add_comment,
+ $comment_view,
))
->addPropertySection(pht('Details'), $details);
@@ -164,26 +165,14 @@
return $curtain;
}
- private function buildCommentForm(FundInitiative $initiative) {
+ private function buildCommentForm(FundInitiative $initiative, $timeline) {
$viewer = $this->getViewer();
+ $box = id(new FundInitiativeEditEngine())
+ ->setViewer($viewer)
+ ->buildEditEngineCommentView($initiative)
+ ->setTransactionTimeline($timeline);
- $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
-
- $add_comment_header = $is_serious
- ? pht('Add Comment')
- : pht('Add Liquidity');
-
- $draft = PhabricatorDraft::newFromUserAndKey(
- $viewer, $initiative->getPHID());
-
- return id(new PhabricatorApplicationTransactionCommentView())
- ->setUser($viewer)
- ->setObjectPHID($initiative->getPHID())
- ->setDraft($draft)
- ->setHeaderText($add_comment_header)
- ->setAction(
- $this->getApplicationURI('/comment/'.$initiative->getID().'/'))
- ->setSubmitButtonName(pht('Add Comment'));
+ return $box;
}
diff --git a/src/applications/fund/xaction/FundInitiativeMerchantTransaction.php b/src/applications/fund/xaction/FundInitiativeMerchantTransaction.php
--- a/src/applications/fund/xaction/FundInitiativeMerchantTransaction.php
+++ b/src/applications/fund/xaction/FundInitiativeMerchantTransaction.php
@@ -45,7 +45,7 @@
return pht(
'%s changed the merchant receiving funds from %s '.
- 'initiative from %s to %s.',
+ 'from %s to %s.',
$this->renderAuthor(),
$this->renderObject(),
$old_merchant,

File Metadata

Mime Type
text/plain
Expires
Thu, May 16, 2:24 AM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6290777
Default Alt Text
D17857.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility