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

Fixed archive public page

Browse source
This commit is contained in:
Dmitry Khomutov 2017-01-19 21:58:45 +07:00
parent 18ac9fadaf
commit 9968983172
No known key found for this signature in database
GPG key ID: 7EB36C9576F9ECB9
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/PHPCensor/Command/PollCommand.php
View file

@ -2,9 +2,9 @@
/**
* PHPCI - Continuous Integration for PHP
*
* @copyright Copyright 2014, Block 8 Limited.
* @license https://github.com/Block8/PHPCI/blob/master/LICENSE.md
* @link https://www.phptesting.org/
* @copyright Copyright 2014, Block 8 Limited.
* @license https://github.com/Block8/PHPCI/blob/master/LICENSE.md
* @link https://www.phptesting.org/
*/
namespace PHPCensor\Command;
@ -21,9 +21,10 @@ use PHPCensor\Model\Build;
/**
* Run console command - Poll github for latest commit id
* @author Jimmy Cleuren <jimmy.cleuren@gmail.com>
* @package PHPCI
* @subpackage Console
*
* @author Jimmy Cleuren <jimmy.cleuren@gmail.com>
* @package PHPCI
* @subpackage Console
*/
class PollCommand extends Command
{

11
src/PHPCensor/Controller/BuildStatusController.php
View file

@ -170,19 +170,18 @@ class BuildStatusController extends Controller
/**
* View the public status page of a given project, if enabled.
* @param $projectId
*
* @param integer $projectId
*
* @return string
*
* @throws \b8\Exception\HttpException\NotFoundException
*/
public function view($projectId)
{
$project = $this->projectStore->getById($projectId);
if (empty($project)) {
throw new NotFoundException('Project with id: ' . $projectId . ' not found');
}
if (!$project->getAllowPublicStatus()) {
if (empty($project) || !$project->getAllowPublicStatus() || $project->getArchived()) {
throw new NotFoundException('Project with id: ' . $projectId . ' not found');
}

2
src/PHPCensor/View/Project/view.phtml
View file

@ -70,7 +70,7 @@
<div class="col-lg-3 col-md-4 col-sm-4">
<?php if ($project->getAllowPublicStatus()): ?>
<?php if ($project->getAllowPublicStatus() && !$project->getArchived()): ?>
<div class="box">
<div class="box-header">
<h4 class="box-title"><?= Lang::get('public_status_title'); ?></h4>