Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: adds Sprint Validator to SprintBoardViewController
......................................................................
adds Sprint Validator to SprintBoardViewController
Bug:T87362
Change-Id: I03926b54cfb597928c4faf2caf53d51a8772f2ad
---
M src/controller/board/SprintBoardViewController.php
1 file changed, 51 insertions(+), 28 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
diff --git a/src/controller/board/SprintBoardViewController.php
b/src/controller/board/SprintBoardViewController.php
index 1a16c46..11a620b 100644
--- a/src/controller/board/SprintBoardViewController.php
+++ b/src/controller/board/SprintBoardViewController.php
@@ -39,6 +39,7 @@
$this->setProject($project);
$this->id = $project->getID();
+ $is_sprint = $this->isSprint($project);
$sort_key = $request->getStr('order');
switch ($sort_key) {
@@ -204,15 +205,27 @@
->setUser($viewer)
->setID($board_id);
- Javelin::initBehavior(
- 'sprint-boards',
- array(
- 'boardID' => $board_id,
- 'projectPHID' => $project->getPHID(),
- 'moveURI' => $this->getApplicationURI('move/'.$project->getID().'/'),
- 'createURI' => '/maniphest/task/create/',
- 'order' => $this->sortKey,
- ), 'sprint');
+ if ($is_sprint == true) {
+ Javelin::initBehavior(
+ 'sprint-boards',
+ array(
+ 'boardID' => $board_id,
+ 'projectPHID' => $project->getPHID(),
+ 'moveURI' =>
$this->getApplicationURI('move/'.$project->getID().'/'),
+ 'createURI' => '/project/sprint/board/task/create/',
+ 'order' => $this->sortKey,
+ ), 'sprint');
+ } else {
+ $this->initBehavior(
+ 'project-boards',
+ array(
+ 'boardID' => $board_id,
+ 'projectPHID' => $project->getPHID(),
+ 'moveURI' =>
$this->getApplicationURI('move/'.$project->getID().'/'),
+ 'createURI' => '/maniphest/task/create/',
+ 'order' => $this->sortKey,
+ ));
+ }
$this->handles = ManiphestTaskListView::loadTaskHandles($viewer, $tasks);
@@ -249,18 +262,18 @@
$panel->setHeaderTag($count_tag);
- $cards = id(new PHUIObjectItemListView())
- ->setUser($viewer)
- ->setFlush(true)
- ->setAllowEmptyList(true)
- ->addSigil('project-column')
- ->setMetadata(
- array(
- 'columnPHID' => $column->getPHID(),
- 'countTagID' => $tag_id,
- 'countTagContentID' => $tag_content_id,
- 'pointLimit' => $column->getPointLimit(),
- ));
+ $cards = id(new PHUIObjectItemListView())
+ ->setUser($viewer)
+ ->setFlush(true)
+ ->setAllowEmptyList(true)
+ ->addSigil('project-column')
+ ->setMetadata(
+ array(
+ 'columnPHID' => $column->getPHID(),
+ 'countTagID' => $tag_id,
+ 'countTagContentID' => $tag_content_id,
+ 'pointLimit' => $column->getPointLimit(),
+ ));
foreach ($column_tasks as $task) {
$owner = null;
@@ -268,13 +281,23 @@
$owner = $this->handles[$task->getOwnerPHID()];
}
$can_edit = idx($task_can_edit_map, $task->getPHID(), false);
- $cards->addItem(id(new SprintBoardTaskCard())
- ->setProject($project)
- ->setViewer($viewer)
- ->setTask($task)
- ->setOwner($owner)
- ->setCanEdit($can_edit)
- ->getItem());
+ if ($is_sprint == true) {
+ $cards->addItem(id(new SprintBoardTaskCard())
+ ->setProject($project)
+ ->setViewer($viewer)
+ ->setTask($task)
+ ->setOwner($owner)
+ ->setCanEdit($can_edit)
+ ->getItem());
+ } else {
+ $cards->addItem(id(new ProjectBoardTaskCard())
+ ->setViewer($viewer)
+ ->setTask($task)
+ ->setOwner($owner)
+ ->setCanEdit($can_edit)
+ ->getItem());
+ }
+
}
$panel->setCards($cards);
$board->addPanel($panel);
--
To view, visit https://gerrit.wikimedia.org/r/188032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I03926b54cfb597928c4faf2caf53d51a8772f2ad
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) <[email protected]>
Gerrit-Reviewer: Christopher Johnson (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
