Christopher Johnson (WMDE) has submitted this change and it was merged.
Change subject: updates to upstream b596d850ff9d566beedea5e7282150614465e2ef 1
December 2015 note: fixes breaking changes
......................................................................
updates to upstream b596d850ff9d566beedea5e7282150614465e2ef
1 December 2015
note: fixes breaking changes
Change-Id: I657c1bd2b3ee0b08e4c8971a237767c1d93c7155
---
M src/controller/board/SprintBoardTaskEditController.php
M src/controller/board/SprintBoardViewController.php
2 files changed, 13 insertions(+), 13 deletions(-)
Approvals:
Christopher Johnson (WMDE): Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/controller/board/SprintBoardTaskEditController.php
b/src/controller/board/SprintBoardTaskEditController.php
index 6e24638..60529d4 100644
--- a/src/controller/board/SprintBoardTaskEditController.php
+++ b/src/controller/board/SprintBoardTaskEditController.php
@@ -198,7 +198,8 @@
// in a meaningful way. For now, build User objects. Once the Maniphest
// objects exist, this will switch over automatically. This is a big
// hack but shouldn't be long for this world.
- $placeholder_editor = new PhabricatorUserProfileEditor();
+ $placeholder_editor = id(new PhabricatorUserProfileEditor())
+ ->setActor($viewer);
$field_errors = $aux_field->validateApplicationTransactions(
$placeholder_editor,
@@ -744,16 +745,17 @@
$crumbs->addTextCrumb($header_name);
- return $this->buildApplicationPage(
- array(
- $crumbs,
- $form_box,
- $preview,
- ),
- array(
- 'title' => $header_name,
- 'pageObjects' => $page_objects,
- ));
+ $title = $header_name;
+
+ return $this->newPage()
+ ->setTitle($title)
+ ->setCrumbs($crumbs)
+ ->setPageObjectPHIDs($page_objects)
+ ->appendChild(
+ array(
+ $form_box,
+ $preview,
+ ));
}
private function getSprintProjectforTask($viewer, $projects) {
diff --git a/src/controller/board/SprintBoardViewController.php
b/src/controller/board/SprintBoardViewController.php
index d2d2058..76a741d 100755
--- a/src/controller/board/SprintBoardViewController.php
+++ b/src/controller/board/SprintBoardViewController.php
@@ -285,7 +285,6 @@
$this->initSprintBehavior(
'sprint-boards',
$behavior_config);
- $this->addExtraQuickSandConfig(array('boardConfig' => $behavior_config));
} else {
$behavior_config = array(
'boardID' => $board_id,
@@ -297,7 +296,6 @@
$this->initBehavior(
'project-boards',
$behavior_config);
- $this->addExtraQuickSandConfig(array('boardConfig' => $behavior_config));
}
$this->handles = ManiphestTaskListView::loadTaskHandles($viewer, $tasks);
--
To view, visit https://gerrit.wikimedia.org/r/256382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I657c1bd2b3ee0b08e4c8971a237767c1d93c7155
Gerrit-PatchSet: 2
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
