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

Merge pull request #62 from JoolsMcFly/fix/wrong-branch-name-in-timeline

Browse source 
display build branch instead of project branch in Home/index and ajax-timeline
This commit is contained in:
Dmitry Khomutov 2017-04-13 18:11:27 +07:00 committed by GitHub
parent 4feb2955cd 1aeeb3ba57
commit 2ca32044db
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/PHPCensor/View/Home/ajax-timeline.phtml
View file

@ -1,6 +1,6 @@
<?php
<?php
use PHPCensor\Helper\Lang;
use PHPCensor\Helper\Lang;
use PHPCensor\Model\Build;
?>
@ -78,7 +78,7 @@ use PHPCensor\Model\Build;
</h3>
<div class="timeline-body">
<a href="<?php echo $build->getBranchLink();?>"><?php echo $build->getProject()->getBranch(); ?></a>
<a href="<?php echo $build->getBranchLink();?>"><?php echo $build->getBranch(); ?></a>
<?php print $branches ? ' + '.implode(', ', $branches) : ''; ?> -
<?php
if ($build->getCommitId() !== 'Manual') {

4
src/PHPCensor/View/Home/index.phtml
View file

@ -1,4 +1,4 @@
<?php
<?php
use PHPCensor\Helper\Lang;
use PHPCensor\Model\Build;
@ -109,7 +109,7 @@ use PHPCensor\Model\Build;
</h3>
<div class="timeline-body">
<a href="<?php echo $build->getBranchLink();?>"><?php echo $build->getProject()->getBranch(); ?></a>
<a href="<?php echo $build->getBranchLink();?>"><?php echo $build->getBranch(); ?></a>
<?php print $branches ? ' + '.implode(', ', $branches) : ''; ?> -
<?php
if ($build->getCommitId() !== 'Manual') {