* code for task #79279.
This commit is contained in:
@@ -283,6 +283,8 @@ class build extends control
|
||||
foreach($stages as $storyID => $stage) $stories[$storyID]->stage = $stage;
|
||||
|
||||
/* Set menu. */
|
||||
$objectType = 'execution';
|
||||
$objectID = $build->execution;
|
||||
if($this->app->tab == 'project')
|
||||
{
|
||||
$this->loadModel('project')->setMenu($build->project);
|
||||
|
||||
@@ -63,7 +63,7 @@ class buildModel extends model
|
||||
*/
|
||||
public function getProjectBuilds($projectID = 0, $type = 'all', $param = 0, $orderBy = 't1.date_desc,t1.id_desc', $pager = null)
|
||||
{
|
||||
return $this->dao->select('t1.*, t2.name as executionName, t2.id as executionID, t3.name as productName')
|
||||
return $this->dao->select('t1.*, t2.name as executionName, t2.id as executionID, t2.deleted as executionDeleted, t3.name as productName')
|
||||
->from(TABLE_BUILD)->alias('t1')
|
||||
->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution = t2.id')
|
||||
->leftJoin(TABLE_PRODUCT)->alias('t3')->on('t1.product = t3.id')
|
||||
|
||||
@@ -84,7 +84,12 @@
|
||||
<?php endif;?>
|
||||
<?php if($project->multiple):?>
|
||||
<?php if($build->execution):?>
|
||||
<td class="c-name text-left" title='<?php echo $build->executionName;?>'><?php echo $build->executionName;?></td>
|
||||
<td class="c-name text-left" title='<?php echo $build->executionName;?>'>
|
||||
<?php echo $build->executionName;?>
|
||||
<?php if($build->executionDeleted):?>
|
||||
<span class='label label-danger'><?php echo $lang->build->deleted;?></span>
|
||||
<?php endif; ?>
|
||||
</td>
|
||||
<?php else:?>
|
||||
<td class="c-name text-left">
|
||||
<?php $childExecutions = array();?>
|
||||
|
||||
Reference in New Issue
Block a user