Page MenuHomePhorge
Files F2680736

D25710.1734620304.diff
No OneTemporary
Actions

D25710.1734620304.diff
View Options

diff --git a/src/applications/conpherence/controller/ConpherenceUpdateController.php b/src/applications/conpherence/controller/ConpherenceUpdateController.php
--- a/src/applications/conpherence/controller/ConpherenceUpdateController.php
+++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php
@@ -79,6 +79,30 @@
$user,
$conpherence,
$message);
+
+ // The above may generate multiple transactions.
+ // In practice, the comment is the only one.
+ $xaction_comment = PhabricatorTransactions::findByType(
+ $xactions,
+ PhabricatorTransactions::TYPE_COMMENT);
+
+ $text_metadata = $request->getStr('text_metadata');
+ if ($text_metadata && $xaction_comment) {
+ $text_metadata = phutil_json_decode($text_metadata);
+ $attached_file_phids = idx($text_metadata,
+ 'attachedFilePHIDs',
+ array());
+ if ($attached_file_phids) {
+ $metadata_object = array(
+ 'remarkup.control' => array(
+ 'attachedFilePHIDs' => $attached_file_phids,
+ ),
+ );
+
+ $xaction_comment->setMetadata($metadata_object);
+ }
+ }
+
$delete_draft = true;
} else {
$action = ConpherenceUpdateActions::LOAD;
diff --git a/src/applications/transactions/constants/PhabricatorTransactions.php b/src/applications/transactions/constants/PhabricatorTransactions.php
--- a/src/applications/transactions/constants/PhabricatorTransactions.php
+++ b/src/applications/transactions/constants/PhabricatorTransactions.php
@@ -41,4 +41,19 @@
);
}
+ /**
+ * Find the first transaction that matches a type.
+ * @param array $xactions
+ * @param string $type
+ * @return PhabricatorTransaction|null
+ */
+ public static function findByType($xactions, $type) {
+ foreach ($xactions as $xaction) {
+ if ($xaction->getTransactionType() === $type) {
+ return $xaction;
+ }
+ }
+ return null;
+ }
+
}

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 19, 14:58 (20 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1015110
Default Alt Text
D25710.1734620304.diff (2 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0