Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: adds SprintValidator to SprintBoardMoveController
......................................................................
adds SprintValidator to SprintBoardMoveController
this fixes a bug for non-Sprint projects if in the Sprint context
moving card returned a Sprint card rather than a project card
Change-Id: I42ee31a59ff83e7ae6c55082718479fea4529ecb
---
M src/controller/board/SprintBoardMoveController.php
1 file changed, 18 insertions(+), 8 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/src/controller/board/SprintBoardMoveController.php
b/src/controller/board/SprintBoardMoveController.php
index ef1203e..3b46891 100644
--- a/src/controller/board/SprintBoardMoveController.php
+++ b/src/controller/board/SprintBoardMoveController.php
@@ -1,7 +1,7 @@
<?php
final class SprintBoardMoveController
- extends PhabricatorProjectController {
+ extends SprintBoardController {
private $id;
@@ -32,6 +32,7 @@
if (!$project) {
return new Aphront404Response();
}
+ $is_sprint = $this->isSprint($project);
$object = id(new PhabricatorObjectQuery())
->setViewer($viewer)
@@ -165,13 +166,22 @@
->withPHIDs(array($object->getOwnerPHID()))
->executeOne();
}
- $card = id(new SprintBoardTaskCard())
- ->setViewer($viewer)
- ->setTask($object)
- ->setProject($project)
- ->setOwner($owner)
- ->setCanEdit(true)
- ->getItem();
+ if ($is_sprint == true) {
+ $card = id(new SprintBoardTaskCard())
+ ->setProject($project)
+ ->setViewer($viewer)
+ ->setTask($object)
+ ->setOwner($owner)
+ ->setCanEdit(true)
+ ->getItem();
+ } else {
+ $card = id(new ProjectBoardTaskCard())
+ ->setViewer($viewer)
+ ->setTask($object)
+ ->setOwner($owner)
+ ->setCanEdit(true)
+ ->getItem();
+ }
return id(new AphrontAjaxResponse())->setContent(
array('task' => $card));
--
To view, visit https://gerrit.wikimedia.org/r/190424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I42ee31a59ff83e7ae6c55082718479fea4529ecb
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de>
Gerrit-Reviewer: Christopher Johnson (WMDE) <christopher.john...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
