deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added Paginator helper. Issue #123.

Browse source
This commit is contained in:
Dmitry Khomutov 2017-10-24 21:42:18 +07:00
commit 3ab04a6503
No known key found for this signature in database
GPG key ID: EC19426474B37AAC
4 changed files with 91 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/PHPCensor/Controller/ProjectController.php
View file

@ -6,6 +6,7 @@ use b8;
use b8\Exception\HttpException\NotFoundException;
use b8\Form;
use b8\Store;
use JasonGrimes\Paginator;
use PHPCensor;
use PHPCensor\BuildFactory;
use PHPCensor\Helper\Github;
@ -95,7 +96,7 @@ class ProjectController extends PHPCensor\Controller
$perPage = $_SESSION['php-censor-user']->getFinalPerPage();
$builds = $this->getLatestBuildsHtml($projectId, $environment, $branch, (($page - 1) * $perPage), $perPage);
$pages = $builds[1] == 0 ? 1 : ceil($builds[1] / $perPage);
$pages = $builds[1] == 0 ? 1 : (integer)ceil($builds[1] / $perPage);
if ($page > $pages) {
$response = new RedirectResponse();
@ -104,6 +105,19 @@ class ProjectController extends PHPCensor\Controller
return $response;
}
$urlPattern = APP_URL . 'project/view/' . $project->getId();
$params = [];
if (!empty($branch)) {
$params['branch'] = $branch;
}
if (!empty($environment)) {
$params['environment'] = $environment;
}
$urlPattern = $urlPattern . '?' . str_replace('%28%3Anum%29', '(:num)', http_build_query(array_merge($params, ['page' => '(:num)'])));
$paginator = new Paginator($builds[1], $perPage, $page, $urlPattern);
$this->view->builds = $builds[0];
$this->view->total = $builds[1];
$this->view->project = $project;
@ -112,8 +126,8 @@ class ProjectController extends PHPCensor\Controller
$this->view->environment = urldecode($environment);
$this->view->environments = $project->getEnvironmentsNames();
$this->view->page = $page;
$this->view->pages = $pages;
$this->view->perPage = $perPage;
$this->view->paginator = $paginator;
$this->layout->title = $project->getTitle();
$this->layout->subtitle = '';