From 74de153e59be0f14f0cd1e49a81660e7e72f82af Mon Sep 17 00:00:00 2001 From: epriestley Date: Sun, 10 Mar 2019 22:31:35 -0700 Subject: [PATCH] Allow MFA task edits to go through on workboards Summary: Depends on D20272. Ref T13074. When a task requires MFA to edit, you currently get a fatal. Provide a cancel URI so the prompt works and the edit can go through. Test Plan: - Locked a task, dragged it on a workboard. - Before: fatal trying to build an MFA gate. - After: got MFA gated, answered prompt, action went through. Reviewers: amckinley Reviewed By: amckinley Maniphest Tasks: T13074 Differential Revision: https://secure.phabricator.com/D20273 --- .../controller/PhabricatorProjectMoveController.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/applications/project/controller/PhabricatorProjectMoveController.php b/src/applications/project/controller/PhabricatorProjectMoveController.php index 6d7902a733..3cfd94894b 100644 --- a/src/applications/project/controller/PhabricatorProjectMoveController.php +++ b/src/applications/project/controller/PhabricatorProjectMoveController.php @@ -43,6 +43,13 @@ final class PhabricatorProjectMoveController return new Aphront404Response(); } + $cancel_uri = $this->getApplicationURI( + new PhutilURI( + urisprintf('board/%d/', $project->getID()), + array( + 'order' => $order, + ))); + $board_phid = $project->getPHID(); $object = id(new ManiphestTaskQuery()) @@ -107,7 +114,8 @@ final class PhabricatorProjectMoveController ->setActor($viewer) ->setContinueOnMissingFields(true) ->setContinueOnNoEffect(true) - ->setContentSourceFromRequest($request); + ->setContentSourceFromRequest($request) + ->setCancelURI($cancel_uri); $editor->applyTransactions($object, $xactions); -- 2.54.0