* [bug#57686] adjust col config for build list.
This commit is contained in:
@@ -53,7 +53,7 @@ window.changeProduct = function()
|
||||
*/
|
||||
window.getCellSpan = function(cell)
|
||||
{
|
||||
if(['id', 'name', 'productName', 'branchName', 'builder', 'date', 'actions'].includes(cell.col.name) && cell.row.data.rowspan)
|
||||
if(['id', 'name', 'productName', 'branchName', 'system', 'builder', 'date', 'actions'].includes(cell.col.name) && cell.row.data.rowspan)
|
||||
{
|
||||
return {rowSpan: cell.row.data.rowspan};
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ jsVar('filePathTip', $lang->build->filePath);
|
||||
jsVar('confirmDelete', $lang->build->confirmDelete);
|
||||
|
||||
$fieldList = $this->loadModel('datatable')->getSetting('execution', 'build');
|
||||
$fieldList['system']['map'] = $system;
|
||||
if(!empty($fieldList['system'])) $fieldList['system']['map'] = $system;
|
||||
if($execution->type == 'kanban')
|
||||
{
|
||||
unset($fieldList['actions']['list']['createTest']['data-app']);
|
||||
|
||||
@@ -69,7 +69,7 @@ window.changeProduct = function(e)
|
||||
*/
|
||||
window.getCellSpan = function(cell)
|
||||
{
|
||||
if(['id', 'name', 'productName', 'branchName', 'builder', 'date', 'actions'].includes(cell.col.name) && cell.row.data.rowspan)
|
||||
if(['id', 'name', 'productName', 'branchName', 'system', 'builder', 'date', 'actions'].includes(cell.col.name) && cell.row.data.rowspan)
|
||||
{
|
||||
return {rowSpan: cell.row.data.rowspan};
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ jsVar('integratedTip', $lang->build->integratedLabel);
|
||||
jsVar('deletedTip', $lang->build->deleted);
|
||||
|
||||
$fieldList = $this->loadModel('datatable')->getSetting('project', 'build');
|
||||
$fieldList['system']['map'] = $system;
|
||||
if(!empty($fieldList['system'])) $fieldList['system']['map'] = $system;
|
||||
if(($project->model == 'kanban' && $app->rawModule == 'projectbuild') || !$project->multiple)
|
||||
{
|
||||
unset($fieldList['actions']['list']['createTest']['data-app']);
|
||||
|
||||
@@ -53,7 +53,7 @@ foreach(array_column($releases, 'system') as $system)
|
||||
{
|
||||
if(!isset($appList[$system])) $appList[$system] = '';
|
||||
}
|
||||
$cols['system']['map'] = array(0 => '') + $appList;
|
||||
if(!empty($cols['system'])) $cols['system']['map'] = array(0 => '') + $appList;
|
||||
|
||||
foreach($releases as $release)
|
||||
{
|
||||
|
||||
@@ -42,7 +42,7 @@ foreach(array_column($releases, 'system') as $system)
|
||||
{
|
||||
if(!isset($appList[$system])) $appList[$system] = '';
|
||||
}
|
||||
$cols['system']['map'] = array(0 => '') + $appList;
|
||||
if(!empty($cols['system'])) $cols['system']['map'] = array(0 => '') + $appList;
|
||||
|
||||
foreach($releases as $release)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user