Merge branch '15.0'
This commit is contained in:
@@ -110,6 +110,9 @@ class project extends control
|
||||
/* Load module. */
|
||||
$this->loadModel('program');
|
||||
|
||||
/* Set cookie for show all project. */
|
||||
$_COOKIE['showClosed'] = 1;
|
||||
|
||||
/* Sort project. */
|
||||
$programs = array();
|
||||
$orderedProjects = array();
|
||||
@@ -956,9 +959,15 @@ class project extends control
|
||||
|
||||
/* Set project builds. */
|
||||
$projectBuilds = array();
|
||||
$productList = $this->project->getProducts($projectID);
|
||||
if(!empty($builds))
|
||||
{
|
||||
foreach($builds as $build) $projectBuilds[$build->product][] = $build;
|
||||
foreach($builds as $build)
|
||||
{
|
||||
/* If product is normal, unset branch name. */
|
||||
if(isset($productList[$build->product]) and $productList[$build->product]->type == 'normal') $build->branchName = '';
|
||||
$projectBuilds[$build->product][] = $build;
|
||||
}
|
||||
}
|
||||
|
||||
/* Header and position. */
|
||||
|
||||
Reference in New Issue
Block a user