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

Fixed branches for SVN build. Issue #65.

Browse source
This commit is contained in:
Dmitry Khomutov 2017-05-17 21:46:55 +07:00
commit e071088bba
No known key found for this signature in database
GPG key ID: 7EB36C9576F9ECB9
4 changed files with 51 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -137,12 +137,16 @@ class ProjectController extends PHPCensor\Controller
*/
public function build($projectId)
{
$type = $this->getParam('type', 'branch');
$id = $this->getParam('id', 'master');
$debug = (boolean)$this->getParam('debug', false);
/* @var \PHPCensor\Model\Project $project */
$project = $this->projectStore->getById($projectId);
$project = $this->projectStore->getById($projectId);
if (empty($project) || $project->getArchived()) {
throw new NotFoundException(Lang::get('project_x_not_found', $projectId));
}
$type = $this->getParam('type', 'branch');
$id = $this->getParam('id');
$debug = (boolean)$this->getParam('debug', false);
$environment = null;
$branch = null;
@ -155,10 +159,6 @@ class ProjectController extends PHPCensor\Controller
break;
}
if (empty($project) || $project->getArchived()) {
throw new NotFoundException(Lang::get('project_x_not_found', $projectId));
}
if (empty($branch)) {
$branch = $project->getBranch();
}
@ -443,6 +443,10 @@ class ProjectController extends PHPCensor\Controller
$field->setClass('form-control')->setContainerClass('form-group');
$form->addField($field);
$field = Form\Element\Text::create('branch', Lang::get('default_branch'), false);
$field->setClass('form-control')->setContainerClass('form-group')->setValue('');
$form->addField($field);
$field = Form\Element\TextArea::create('key', Lang::get('project_private_key'), false);
$field->setClass('form-control')->setContainerClass('form-group');
$field->setRows(6);
@ -453,10 +457,6 @@ class ProjectController extends PHPCensor\Controller
$field->setRows(6);
$form->addField($field);
$field = Form\Element\Text::create('branch', Lang::get('default_branch'), true);
$field->setClass('form-control')->setContainerClass('form-group')->setValue('master');
$form->addField($field);
$field = Form\Element\TextArea::create('environments', Lang::get('environments_label'), false);
$field->setClass('form-control')->setContainerClass('form-group');
$field->setRows(6);