* [bug#30619,done,0.5h,0h] Adjust projectrelease branch name.
This commit is contained in:
@@ -20,11 +20,5 @@ window.renderCell = function(result, {col, row})
|
||||
return result;
|
||||
}
|
||||
|
||||
if(col.name == 'branch')
|
||||
{
|
||||
result[0] = row.data.branchName
|
||||
return result;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -33,6 +33,7 @@ jsVar('canViewProjectbuild', hasPriv('projectbuild', 'view'));
|
||||
|
||||
$cols = $this->loadModel('datatable')->getSetting('projectrelease');
|
||||
if(!$showBranch) unset($cols['branch']);
|
||||
if(isset($cols['branch'])) $cols['branch']['name'] = 'branchName';
|
||||
if(isset($cols['product'])) $cols['product']['map'] = $products;
|
||||
if(empty($project->hasProduct)) unset($cols['product']);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user