From 92223987987c10a6a406494acde20104dcc1e555 Mon Sep 17 00:00:00 2001 From: Christopher Johnson <christopher.johnson@wikimedia.de> Date: Fri, 2 Sep 2016 21:48:23 +0200 Subject: [PATCH] changes buildApplicationPage() to newPage() ref upstream change https://secure.phabricator.com/rP2201c65eb73fb99b8625bea45c273d262f2c289f 23/08/2016 Bug:T144295 Change-Id: Ib1344daf30ea28a66416e9c5a3b2dcb544a11654 --- src/controller/SprintHistoryController.php | 12 +++++------- src/controller/SprintListController.php | 11 ++++------- src/controller/SprintReportController.php | 11 ++++------- src/view/reports/SprintHistoryTableView.php | 2 +- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/src/controller/SprintHistoryController.php b/src/controller/SprintHistoryController.php index e39f7f4..caaeeec 100644 --- a/src/controller/SprintHistoryController.php +++ b/src/controller/SprintHistoryController.php @@ -22,6 +22,7 @@ final class SprintHistoryController extends SprintController { } $error_box = null; + $sprintlist_table = null; $history_model = id(new SprintHistoryDataProvider()) ->setViewer($this->viewer) ->setRequest($request) @@ -60,12 +61,9 @@ final class SprintHistoryController extends SprintController { $help, $sprintlist_table, )); - - return $this->buildApplicationPage( - $nav, - array( - 'title' => array(pht('Task Project History')), - 'device' => true, - )); + $title = pht('Task Project History'); + return $this->newPage() + ->setTitle($title) + ->appendChild($nav); } } diff --git a/src/controller/SprintListController.php b/src/controller/SprintListController.php index 370b188..a083016 100644 --- a/src/controller/SprintListController.php +++ b/src/controller/SprintListController.php @@ -42,12 +42,9 @@ final class SprintListController extends SprintController { $help, $sprintlist_table, )); - - return $this->buildApplicationPage( - $nav, - array( - 'title' => array(pht('Sprint List')), - 'device' => true, - )); + $title = pht('Sprint List'); + return $this->newPage() + ->setTitle($title) + ->appendChild($nav); } } diff --git a/src/controller/SprintReportController.php b/src/controller/SprintReportController.php index 88a6cb4..15365f9 100644 --- a/src/controller/SprintReportController.php +++ b/src/controller/SprintReportController.php @@ -58,12 +58,9 @@ final class SprintReportController extends SprintController { $this->buildSprintApplicationCrumbs($can_create) ->setBorder(true) ->addTextCrumb(pht('Reports'))); - - return $this->buildApplicationPage( - $nav, - array( - 'title' => pht('Sprint Reports'), - 'device' => false, - )); + $title = pht('Sprint Reports'); + return $this->newPage() + ->setTitle($title) + ->appendChild($nav); } } diff --git a/src/view/reports/SprintHistoryTableView.php b/src/view/reports/SprintHistoryTableView.php index 444a680..faecbe7 100644 --- a/src/view/reports/SprintHistoryTableView.php +++ b/src/view/reports/SprintHistoryTableView.php @@ -18,7 +18,7 @@ final class SprintHistoryTableView extends SprintView { public function render() { require_celerity_resource('sprint-report-css', 'sprint'); - $filter = $this->BuildFilter($this->request); + $filter = $this->buildFilter($this->viewer, $this->request); if ($this->request->getStr('project')) { $table = $this->buildProjectsTable(); } else { -- GitLab