Page MenuHomePhorge
Files F2503179

D25705.1726793931.diff
No OneTemporary
Actions

D25705.1726793931.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,29 @@
$user,
$conpherence,
$message);
+
+ $text_metadata = $request->getStr('text_metadata');
+ if ($text_metadata) {
+ $text_metadata = phutil_json_decode($text_metadata);
+ if (
+ isset($text_metadata['attachedFilePHIDs']) &&
+ is_array($text_metadata['attachedFilePHIDs'])
+ ) {
+ $attached_file_phids = idx($text_metadata,
+ 'attachedFilePHIDs',
+ array());
+ if ($attached_file_phids) {
+ $metadata_object = array(
+ 'remarkup.control' => array(
+ 'attachedFilePHIDs' => $attached_file_phids,
+ ),
+ );
+
+ $xactions[0]->setMetadata($metadata_object);
+ }
+ }
+ }
+
$delete_draft = true;
} else {
$action = ConpherenceUpdateActions::LOAD;
diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php
--- a/src/applications/phriction/controller/PhrictionEditController.php
+++ b/src/applications/phriction/controller/PhrictionEditController.php
@@ -117,6 +117,7 @@
$v_cc = $request->getArr('cc');
$v_projects = $request->getArr('projects');
$v_space = $request->getStr('spacePHID');
+ $file_phids_to_attach = [];
if ($save_as_draft) {
$edit_type = PhrictionDocumentDraftTransaction::TRANSACTIONTYPE;
@@ -134,9 +135,29 @@
$xactions[] = id(new PhrictionTransaction())
->setTransactionType(PhrictionDocumentTitleTransaction::TRANSACTIONTYPE)
->setNewValue($title);
- $xactions[] = id(new PhrictionTransaction())
+ $content_xaction = id(new PhrictionTransaction())
->setTransactionType($edit_type)
->setNewValue($content_text);
+
+ $content_metadata = $request->getStr('content_metadata');
+ $content_metadata = phutil_json_decode($content_metadata);
+ $attached_file_phids = idx(
+ $content_metadata,
+ 'attachedFilePHIDs',
+ array());
+
+ if ($attached_file_phids) {
+ $metadata_object = array(
+ 'remarkup.control' => array(
+ 'attachedFilePHIDs' => $attached_file_phids,
+ ),
+ );
+
+ $content_xaction->setMetadata($metadata_object);
+ }
+
+ $xactions[] = $content_xaction;
+
$xactions[] = id(new PhrictionTransaction())
->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
->setNewValue($v_view)

File Metadata

Mime Type
text/plain
Expires
Fri, Sep 20, 00:58 (3 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
892749
Default Alt Text
D25705.1726793931.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