From 146470f39d7667ddc14996ce6cf7937e80bf687a Mon Sep 17 00:00:00 2001 From: Dan Cryer Date: Wed, 30 Apr 2014 15:24:55 +0100 Subject: [PATCH] Make project overview table update when build list does on dashboard, fixes #336 --- PHPCI/Controller/HomeController.php | 33 +++++++++++++++++++---------- PHPCI/View/Home/index.phtml | 8 +++++-- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/PHPCI/Controller/HomeController.php b/PHPCI/Controller/HomeController.php index b2d4bd6b..dc4027ad 100644 --- a/PHPCI/Controller/HomeController.php +++ b/PHPCI/Controller/HomeController.php @@ -41,20 +41,11 @@ class HomeController extends \PHPCI\Controller */ public function index() { - $projects = $this->projectStore->getWhere(array(), 50, 0, array(), array('title' => 'ASC')); - - $summaryBuilds = array(); - foreach ($projects['items'] as $project) { - $summaryBuilds[$project->getId()] = $this->buildStore->getLatestBuilds($project->getId()); - } - - $summaryView = new b8\View('SummaryTable'); - $summaryView->projects = $projects['items']; - $summaryView->builds = $summaryBuilds; + $projects = $this->projectStore->getWhere(array(), 50, 0, array(), array('title' => 'ASC')); $this->view->builds = $this->getLatestBuildsHtml(); $this->view->projects = $projects['items']; - $this->view->summary = $summaryView->render(); + $this->view->summary = $this->getSummaryHtml($projects); $this->config->set('page_title', 'Dashboard'); @@ -69,6 +60,26 @@ class HomeController extends \PHPCI\Controller die($this->getLatestBuildsHtml()); } + public function summary() + { + $projects = $this->projectStore->getWhere(array(), 50, 0, array(), array('title' => 'ASC')); + die($this->getSummaryHtml($projects)); + } + + protected function getSummaryHtml($projects) + { + $summaryBuilds = array(); + foreach ($projects['items'] as $project) { + $summaryBuilds[$project->getId()] = $this->buildStore->getLatestBuilds($project->getId()); + } + + $summaryView = new b8\View('SummaryTable'); + $summaryView->projects = $projects['items']; + $summaryView->builds = $summaryBuilds; + + return $summaryView->render(); + } + /** * Get latest builds and render as a table. */ diff --git a/PHPCI/View/Home/index.phtml b/PHPCI/View/Home/index.phtml index d6da55eb..a103b413 100644 --- a/PHPCI/View/Home/index.phtml +++ b/PHPCI/View/Home/index.phtml @@ -64,12 +64,16 @@