mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-12 00:26:13 +01:00
cac26c8824
Summary: Fixes T10912. When you drag tasks within a milestone, we currently apply an overbroad, API-focused rule and add the parent board's project. This logic was added fairly recently, as part of T6027, to improve the behavior of API-originated moves. Later on, this causes the task to toggle in and out of the parent project on every alternate drag. This logic is also partially duplicated in the `MoveController`. - Add test coverage for this interaction. - Fix the logic so it accounts for subproject / milestone columns correctly. - Put all of the logic into the TransactionEditor, so the API gets the exact same rules. Test Plan: - Added a failing test and made it pass. - Dragged tasks around within a milestone column: - Before patch: they got bogus project swaps on every other move. - After patch: projects didn't change (correct). - Dragged tasks around between normal and milestone columns. - Before patch: worked properly. - After patch: still works properly. Here's what the bad changes look like, the task is swapping projects with every other move: {F1255957} The "every other" is because the logic was trying to do this: - Add both the parent and milestone project. - Whichever one exists already gets dropped from the change list because it would have no effect. - The other one then applies. - In applying, it forces removal of the first one. - Then this process repeats in the other direction the next time through. Reviewers: chad Reviewed By: chad Maniphest Tasks: T10912 Differential Revision: https://secure.phabricator.com/D15834
203 lines
5.2 KiB
PHP
203 lines
5.2 KiB
PHP
<?php
|
|
|
|
final class PhabricatorProjectMoveController
|
|
extends PhabricatorProjectController {
|
|
|
|
public function handleRequest(AphrontRequest $request) {
|
|
$viewer = $request->getViewer();
|
|
$id = $request->getURIData('id');
|
|
|
|
$request->validateCSRF();
|
|
|
|
$column_phid = $request->getStr('columnPHID');
|
|
$object_phid = $request->getStr('objectPHID');
|
|
$after_phid = $request->getStr('afterPHID');
|
|
$before_phid = $request->getStr('beforePHID');
|
|
$order = $request->getStr('order', PhabricatorProjectColumn::DEFAULT_ORDER);
|
|
|
|
$project = id(new PhabricatorProjectQuery())
|
|
->setViewer($viewer)
|
|
->requireCapabilities(
|
|
array(
|
|
PhabricatorPolicyCapability::CAN_VIEW,
|
|
))
|
|
->withIDs(array($id))
|
|
->executeOne();
|
|
if (!$project) {
|
|
return new Aphront404Response();
|
|
}
|
|
|
|
$board_phid = $project->getPHID();
|
|
|
|
$object = id(new ManiphestTaskQuery())
|
|
->setViewer($viewer)
|
|
->withPHIDs(array($object_phid))
|
|
->needProjectPHIDs(true)
|
|
->requireCapabilities(
|
|
array(
|
|
PhabricatorPolicyCapability::CAN_VIEW,
|
|
PhabricatorPolicyCapability::CAN_EDIT,
|
|
))
|
|
->executeOne();
|
|
|
|
if (!$object) {
|
|
return new Aphront404Response();
|
|
}
|
|
|
|
$columns = id(new PhabricatorProjectColumnQuery())
|
|
->setViewer($viewer)
|
|
->withProjectPHIDs(array($project->getPHID()))
|
|
->execute();
|
|
|
|
$columns = mpull($columns, null, 'getPHID');
|
|
$column = idx($columns, $column_phid);
|
|
if (!$column) {
|
|
// User is trying to drop this object into a nonexistent column, just kick
|
|
// them out.
|
|
return new Aphront404Response();
|
|
}
|
|
|
|
$engine = id(new PhabricatorBoardLayoutEngine())
|
|
->setViewer($viewer)
|
|
->setBoardPHIDs(array($board_phid))
|
|
->setObjectPHIDs(array($object_phid))
|
|
->executeLayout();
|
|
|
|
$columns = $engine->getObjectColumns($board_phid, $object_phid);
|
|
$old_column_phids = mpull($columns, 'getPHID');
|
|
|
|
$xactions = array();
|
|
|
|
$order_params = array();
|
|
if ($order == PhabricatorProjectColumn::ORDER_NATURAL) {
|
|
if ($after_phid) {
|
|
$order_params['afterPHID'] = $after_phid;
|
|
} else if ($before_phid) {
|
|
$order_params['beforePHID'] = $before_phid;
|
|
}
|
|
}
|
|
|
|
$xactions[] = id(new ManiphestTransaction())
|
|
->setTransactionType(PhabricatorTransactions::TYPE_COLUMNS)
|
|
->setNewValue(
|
|
array(
|
|
array(
|
|
'columnPHID' => $column->getPHID(),
|
|
) + $order_params,
|
|
));
|
|
|
|
if ($order == PhabricatorProjectColumn::ORDER_PRIORITY) {
|
|
$priority_xactions = $this->getPriorityTransactions(
|
|
$object,
|
|
$after_phid,
|
|
$before_phid);
|
|
foreach ($priority_xactions as $xaction) {
|
|
$xactions[] = $xaction;
|
|
}
|
|
}
|
|
|
|
$editor = id(new ManiphestTransactionEditor())
|
|
->setActor($viewer)
|
|
->setContinueOnMissingFields(true)
|
|
->setContinueOnNoEffect(true)
|
|
->setContentSourceFromRequest($request);
|
|
|
|
$editor->applyTransactions($object, $xactions);
|
|
|
|
return $this->newCardResponse($board_phid, $object_phid);
|
|
}
|
|
|
|
private function getPriorityTransactions(
|
|
ManiphestTask $task,
|
|
$after_phid,
|
|
$before_phid) {
|
|
|
|
list($after_task, $before_task) = $this->loadPriorityTasks(
|
|
$after_phid,
|
|
$before_phid);
|
|
|
|
$must_move = false;
|
|
if ($after_task && !$task->isLowerPriorityThan($after_task)) {
|
|
$must_move = true;
|
|
}
|
|
|
|
if ($before_task && !$task->isHigherPriorityThan($before_task)) {
|
|
$must_move = true;
|
|
}
|
|
|
|
// The move doesn't require a priority change to be valid, so don't
|
|
// change the priority since we are not being forced to.
|
|
if (!$must_move) {
|
|
return array();
|
|
}
|
|
|
|
$try = array(
|
|
array($after_task, true),
|
|
array($before_task, false),
|
|
);
|
|
|
|
$pri = null;
|
|
$sub = null;
|
|
foreach ($try as $spec) {
|
|
list($task, $is_after) = $spec;
|
|
|
|
if (!$task) {
|
|
continue;
|
|
}
|
|
|
|
list($pri, $sub) = ManiphestTransactionEditor::getAdjacentSubpriority(
|
|
$task,
|
|
$is_after);
|
|
}
|
|
|
|
$xactions = array();
|
|
if ($pri !== null) {
|
|
$xactions[] = id(new ManiphestTransaction())
|
|
->setTransactionType(ManiphestTransaction::TYPE_PRIORITY)
|
|
->setNewValue($pri);
|
|
$xactions[] = id(new ManiphestTransaction())
|
|
->setTransactionType(ManiphestTransaction::TYPE_SUBPRIORITY)
|
|
->setNewValue($sub);
|
|
}
|
|
|
|
return $xactions;
|
|
}
|
|
|
|
private function loadPriorityTasks($after_phid, $before_phid) {
|
|
$viewer = $this->getViewer();
|
|
|
|
$task_phids = array();
|
|
|
|
if ($after_phid) {
|
|
$task_phids[] = $after_phid;
|
|
}
|
|
if ($before_phid) {
|
|
$task_phids[] = $before_phid;
|
|
}
|
|
|
|
if (!$task_phids) {
|
|
return array(null, null);
|
|
}
|
|
|
|
$tasks = id(new ManiphestTaskQuery())
|
|
->setViewer($viewer)
|
|
->withPHIDs($task_phids)
|
|
->execute();
|
|
$tasks = mpull($tasks, null, 'getPHID');
|
|
|
|
if ($after_phid) {
|
|
$after_task = idx($tasks, $after_phid);
|
|
} else {
|
|
$after_task = null;
|
|
}
|
|
|
|
if ($before_phid) {
|
|
$before_task = idx($tasks, $before_phid);
|
|
} else {
|
|
$before_task = null;
|
|
}
|
|
|
|
return array($after_task, $before_task);
|
|
}
|
|
|
|
}
|