revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-08 21:08:29 +01:00
Code Issues Releases Wiki Activity

Fix batch editor for edits which both add and remove projects

Browse source 
Summary:
Aggregate multiple add/remove transactions so we don't restore removed projects for a (remove + add) batch edit.

(Possibly we should do this in the TransactionEditor as well / instead, but it's fairly easy here and this is the only possible case currently.)

Test Plan: Performed a remove + add batch edit without issues.

Reviewers: btrahan

Reviewed By: btrahan

CC: cpiro, aran, epriestley

Maniphest Tasks: T985

Differential Revision: https://secure.phabricator.com/D1967
This commit is contained in:
epriestley 2012-03-21 04:37:01 -07:00
parent 238b403509
commit 81be1cf27b
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/applications/maniphest/controller/batch/ManiphestBatchEditController.php
View file

@ -143,6 +143,8 @@ final class ManiphestBatchEditController extends ManiphestController {
// TODO: Set content source to "batch edit". // TODO: Set content source to "batch edit".
$project_xaction = null;
$xactions = array(); $xactions = array();
foreach ($actions as $action) { foreach ($actions as $action) {
$value = $action['value']; $value = $action['value'];
@ -152,7 +154,20 @@ final class ManiphestBatchEditController extends ManiphestController {
$is_remove = ($action['action'] == 'remove_project'); $is_remove = ($action['action'] == 'remove_project');
$current = array_fill_keys($task->getProjectPHIDs(), true); // We want to roll up all of the add and remove actions into a single
// transaction so we don't restore removed projects or remove added
// projects in subsequent transactions. If we've already made some
// modification to a task's projects, use that as the starting point.
// Otherwise, start with the value on the task.
if ($project_xaction) {
$xaction = $project_xaction;
$current = $xaction->getNewValue();
} else {
$current = $task->getProjectPHIDs();
}
$current = array_fill_keys($current, true);
$value = array_fill_keys($value, true); $value = array_fill_keys($value, true);
$new = $current; $new = $current;
@ -178,11 +193,20 @@ final class ManiphestBatchEditController extends ManiphestController {
break; break;
} }
// If this is the first project-related transaction, create a new
// transaction object and populate it with appropriate defaults.
if (!$project_xaction) {
$xaction = clone $template;
$xaction->setTransactionType(
ManiphestTransactionType::TYPE_PROJECTS);
$xactions[] = $xaction;
$project_xaction = $xaction;
}
$new = array_keys($new); $new = array_keys($new);
$xaction = clone $template;
$xaction->setTransactionType(ManiphestTransactionType::TYPE_PROJECTS);
$xaction->setNewValue($new); $xaction->setNewValue($new);
$xactions[] = $xaction;
break; break;
} }
} }