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

Merge pull request #459 from FriTOol/master

Browse source 
Feature: Choose branch
This commit is contained in:
Steve B 2014-06-27 14:31:52 +01:00
commit a8ac14b1dd
4 changed files with 90 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
PHPCI/Controller/ProjectController.php
View file

@ -92,7 +92,7 @@ class ProjectController extends \PHPCI\Controller
$build->setProjectId($projectId);
$build->setCommitId('Manual');
$build->setStatus(Build::STATUS_NEW);
$build->setBranch($project->getType() === 'hg' ? 'default' : 'master');
$build->setBranch($project->getBranch());
$build->setCreated(new \DateTime());
$build->setCommitterEmail($_SESSION['user']->getEmail());
@ -319,6 +319,14 @@ class ProjectController extends \PHPCI\Controller
$field->setContainerClass('form-group');
$form->addField($field);
$field = new Form\Element\Text('branch');
$field->setRequired(true);
$field->setValidator($this->getReferenceValidator($values));
$field->setLabel('Branch name');
$field->setClass('form-control');
$field->setContainerClass('form-group');
$form->addField($field);
$field = new Form\Element\Text('title');
$field->setRequired(true);
$field->setLabel('Project Title');