revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-30 01:10:58 +01:00
Code Issues Releases Wiki Activity

Fix some minor issues with Maniphest file/attachment handling

Browse source 
Summary:
@danielraffel is reporting an issue with file attachments which I can't
reproduce, but I did find a couple of minor things.

  - Elsewhere, we store array() as the value of these PHID dictionaries (the
idea being that we might store metadata there some day). While we may or may not
do this, we should at least be consistent.
  - When you edit a task, there's a file upload control but it doesn't actually
do anything. Just don't show it, there's no real reason to have it there.

Test Plan: Created a new task with attached files, verified they encoded as "[]"
instead of "true" in the database. Edited a task and didn't get a file control.

Reviewers: jungejason, nh, tuomaspelkonen, aran

Reviewed By: aran

CC: danielraffel, aran

Differential Revision: 1003
This commit is contained in:
epriestley 2011-10-11 19:30:11 -07:00
parent 9030f489cf
commit 97f38b4e27
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/applications/maniphest/controller/taskedit/ManiphestTaskEditController.php
View file

@ -176,7 +176,7 @@ class ManiphestTaskEditController extends ManiphestController {
if ($files) { if ($files) {
$file_map = mpull($files, 'getPHID'); $file_map = mpull($files, 'getPHID');
$file_map = array_fill_keys($file_map, true); $file_map = array_fill_keys($file_map, array());
$changes[ManiphestTransactionType::TYPE_ATTACH] = array( $changes[ManiphestTransactionType::TYPE_ATTACH] = array(
PhabricatorPHIDConstants::PHID_TYPE_FILE => $file_map, PhabricatorPHIDConstants::PHID_TYPE_FILE => $file_map,
); );
@ -234,7 +234,7 @@ class ManiphestTaskEditController extends ManiphestController {
// NOTE: It's safe to simply apply this transaction without doing // NOTE: It's safe to simply apply this transaction without doing
// cycle detection because we know the new task has no children. // cycle detection because we know the new task has no children.
$new_value = $parent_task->getAttached(); $new_value = $parent_task->getAttached();
$new_value[$type_task][$task->getPHID()] = true; $new_value[$type_task][$task->getPHID()] = array();
$parent_xaction = clone $template; $parent_xaction = clone $template;
$attach_type = ManiphestTransactionType::TYPE_ATTACH; $attach_type = ManiphestTransactionType::TYPE_ATTACH;
@ -475,13 +475,19 @@ class ManiphestTaskEditController extends ManiphestController {
->setLabel('Description') ->setLabel('Description')
->setName('description') ->setName('description')
->setCaption($email_hint) ->setCaption($email_hint)
->setValue($task->getDescription())) ->setValue($task->getDescription()));
if (!$task->getID()) {
$form
->appendChild( ->appendChild(
id(new AphrontFormDragAndDropUploadControl()) id(new AphrontFormDragAndDropUploadControl())
->setLabel('Attached Files') ->setLabel('Attached Files')
->setName('files') ->setName('files')
->setDragAndDropTarget($panel_id) ->setDragAndDropTarget($panel_id)
->setActivatedClass('aphront-panel-view-drag-and-drop')) ->setActivatedClass('aphront-panel-view-drag-and-drop'));
}
$form
->appendChild( ->appendChild(
id(new AphrontFormSubmitControl()) id(new AphrontFormSubmitControl())
->addCancelButton($cancel_uri) ->addCancelButton($cancel_uri)