revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-27 01:02:42 +01:00
Code Issues Releases Wiki Activity

Send Maniphest transaction preview through new code

Browse source 
Summary: Ref T2217. Get rid of this rendering pathway's internals and move them to the modern stuff.

Test Plan: See screenshot.

Reviewers: btrahan

Reviewed By: btrahan

CC: aran

Maniphest Tasks: T2217

Differential Revision: https://secure.phabricator.com/D7072
This commit is contained in:
epriestley 2013-09-23 14:29:59 -07:00
parent 781c11560f
commit e27a83960c
2 changed files with 38 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
View file

@ -33,9 +33,14 @@ final class ManiphestTransactionPreviewController extends ManiphestController {
$transaction = new ManiphestTransaction(); $transaction = new ManiphestTransaction();
$transaction->setAuthorPHID($user->getPHID()); $transaction->setAuthorPHID($user->getPHID());
$transaction->setComments($comments);
$transaction->setTransactionType($action); $transaction->setTransactionType($action);
// This should really be split into a separate transaction, but it should
// all come out in the wash once we fully move to modern stuff.
$transaction->getModernTransaction()->attachComment(
id(new ManiphestTransactionComment())
->setContent($comments));
$value = $request->getStr('value'); $value = $request->getStr('value');
// grab phids for handles and set transaction values based on action and // grab phids for handles and set transaction values based on action and
// value (empty or control-specific format) coming in from the wire // value (empty or control-specific format) coming in from the wire
@ -56,17 +61,19 @@ final class ManiphestTransactionPreviewController extends ManiphestController {
case ManiphestTransactionType::TYPE_CCS: case ManiphestTransactionType::TYPE_CCS:
if ($value) { if ($value) {
$value = json_decode($value); $value = json_decode($value);
$phids = $value;
foreach ($task->getCCPHIDs() as $cc_phid) {
$phids[] = $cc_phid;
$value[] = $cc_phid;
}
$transaction->setNewValue($value);
} else {
$phids = array();
$transaction->setNewValue(array());
} }
if (!$value) {
$value = array();
}
$phids = $value;
foreach ($task->getCCPHIDs() as $cc_phid) {
$phids[] = $cc_phid;
$value[] = $cc_phid;
}
$transaction->setOldValue($task->getCCPHIDs()); $transaction->setOldValue($task->getCCPHIDs());
$transaction->setNewValue($value);
break; break;
case ManiphestTransactionType::TYPE_PROJECTS: case ManiphestTransactionType::TYPE_PROJECTS:
if ($value) { if ($value) {
@ -92,23 +99,28 @@ final class ManiphestTransactionPreviewController extends ManiphestController {
$handles = $this->loadViewerHandles($phids); $handles = $this->loadViewerHandles($phids);
$transactions = array(); $transactions = array();
$transactions[] = $transaction; $transactions[] = $transaction;
$engine = new PhabricatorMarkupEngine(); $engine = new PhabricatorMarkupEngine();
$engine->setViewer($user); $engine->setViewer($user);
$engine->addObject($transaction, ManiphestTransaction::MARKUP_FIELD_BODY); if ($transaction->getModernTransaction()->hasComment()) {
$engine->addObject(
$transaction->getModernTransaction()->getComment(),
PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
}
$engine->process(); $engine->process();
$transaction_view = new ManiphestTransactionListView(); $transaction->getModernTransaction()->setHandles($handles);
$transaction_view->setTransactions($transactions);
$transaction_view->setHandles($handles); $view = id(new PhabricatorApplicationTransactionView())
$transaction_view->setUser($user); ->setUser($user)
$transaction_view->setMarkupEngine($engine); ->setTransactions(mpull($transactions, 'getModernTransaction'))
$transaction_view->setPreview(true); ->setIsPreview(true)
->setIsDetailView(true);
return id(new AphrontAjaxResponse()) return id(new AphrontAjaxResponse())
->setContent($transaction_view->render()); ->setContent((string)phutil_implode_html('', $view->buildEvents()));
} }
} }

8
src/applications/transactions/storage/PhabricatorApplicationTransaction.php
View file

@ -306,12 +306,18 @@ abstract class PhabricatorApplicationTransaction
$this->renderHandleLink($author_phid), $this->renderHandleLink($author_phid),
count($add), count($add),
$this->renderHandleList($add)); $this->renderHandleList($add));
} else { } else if ($rem) {
return pht( return pht(
'%s removed %d subscriber(s): %s.', '%s removed %d subscriber(s): %s.',
$this->renderHandleLink($author_phid), $this->renderHandleLink($author_phid),
count($rem), count($rem),
$this->renderHandleList($rem)); $this->renderHandleList($rem));
} else {
// This is used when rendering previews, before the user actually
// selects any CCs.
return pht(
'%s updated subscribers...',
$this->renderHandleLink($author_phid));
} }
break; break;
case PhabricatorTransactions::TYPE_EDGE: case PhabricatorTransactions::TYPE_EDGE: