From 8da441d77cd5494d52f5283519db725f84841964 Mon Sep 17 00:00:00 2001
From: liyang <liyang@easycorp.ltd>
Date: Mon, 2 Dec 2024 16:13:31 +0800
Subject: [PATCH] * [bug#57686] adjust col config for build list.

---
 module/execution/js/build.ui.js          | 2 +-
 module/execution/ui/build.html.php       | 2 +-
 module/project/js/build.ui.js            | 2 +-
 module/project/ui/build.html.php         | 2 +-
 module/projectrelease/ui/browse.html.php | 2 +-
 module/release/ui/browse.html.php        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/execution/js/build.ui.js b/module/execution/js/build.ui.js
index 92e34d7e28..800492ee48 100644
--- a/module/execution/js/build.ui.js
+++ b/module/execution/js/build.ui.js
@@ -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};
     }
diff --git a/module/execution/ui/build.html.php b/module/execution/ui/build.html.php
index 387bea6794..f3bcb267d0 100644
--- a/module/execution/ui/build.html.php
+++ b/module/execution/ui/build.html.php
@@ -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']);
diff --git a/module/project/js/build.ui.js b/module/project/js/build.ui.js
index 82e6ecba3a..d3444798eb 100644
--- a/module/project/js/build.ui.js
+++ b/module/project/js/build.ui.js
@@ -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};
     }
diff --git a/module/project/ui/build.html.php b/module/project/ui/build.html.php
index ed90dcbef6..105a2e8e80 100644
--- a/module/project/ui/build.html.php
+++ b/module/project/ui/build.html.php
@@ -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']);
diff --git a/module/projectrelease/ui/browse.html.php b/module/projectrelease/ui/browse.html.php
index beea7d8945..8460bd209b 100644
--- a/module/projectrelease/ui/browse.html.php
+++ b/module/projectrelease/ui/browse.html.php
@@ -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)
 {
diff --git a/module/release/ui/browse.html.php b/module/release/ui/browse.html.php
index 4b55a8215a..3310e5ccea 100644
--- a/module/release/ui/browse.html.php
+++ b/module/release/ui/browse.html.php
@@ -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)
 {