Page MenuHomePhabricator
Files F15449009

D10023.id24202.diff
No OneTemporary
Actions

D10023.id24202.diff
View Options

diff --git a/src/applications/audit/constants/PhabricatorAuditActionConstants.php b/src/applications/audit/constants/PhabricatorAuditActionConstants.php
--- a/src/applications/audit/constants/PhabricatorAuditActionConstants.php
+++ b/src/applications/audit/constants/PhabricatorAuditActionConstants.php
@@ -9,6 +9,7 @@
const CLOSE = 'close';
const ADD_CCS = 'add_ccs';
const ADD_AUDITORS = 'add_auditors';
+ const INLINE = 'audit:inline';
public static function getActionNameMap() {
$map = array(
diff --git a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
--- a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
+++ b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
@@ -57,13 +57,8 @@
->save();
$content_blocks = array($comment->getContent());
-
- if ($inline_comments) {
- foreach ($inline_comments as $inline) {
- $inline->setAuditCommentID($comment->getID());
- $inline->save();
- $content_blocks[] = $inline->getContent();
- }
+ foreach ($inline_comments as $inline) {
+ $content_blocks[] = $inline->getContent();
}
$ccs = $this->ccs;
@@ -280,6 +275,20 @@
$commit->updateAuditStatus($requests);
$commit->save();
+ $comments = array($comment);
+ foreach ($inline_comments as $inline) {
+ $xaction = id(new PhabricatorAuditComment())
+ ->setAction(PhabricatorAuditActionConstants::INLINE)
+ ->setActorPHID($actor->getPHID())
+ ->setTargetPHID($commit->getPHID())
+ ->save();
+
+ $inline->setAuditCommentID($xaction->getID());
+ $inline->save();
+
+ $comments[] = $xaction;
+ }
+
$feed_dont_publish_phids = array();
foreach ($requests as $request) {
$status = $request->getAuditStatus();
@@ -305,7 +314,7 @@
if (!$this->noEmail) {
$this->sendMail(
- array($comment),
+ $comments,
$other_comments,
$inline_comments,
$requests);
@@ -530,6 +539,10 @@
$body = new PhabricatorMetaMTAMailBody();
foreach ($comments as $comment) {
+ if ($comment->getAction() == PhabricatorAuditActionConstants::INLINE) {
+ continue;
+ }
+
$verb = PhabricatorAuditActionConstants::getActionPastTenseVerb(
$comment->getAction());

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 29, 8:09 AM (2 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7704648
Default Alt Text
D10023.id24202.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility