From 2f56082eb16150aef7282a94b62e39cd0f0c3264 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Mon, 29 Jul 2024 02:27:03 +0000
Subject: [PATCH]  * [task#123529,done,0.5h] add custom cols in project
 release.

---
 module/projectrelease/control.php        |  7 ++-----
 module/projectrelease/ui/browse.html.php | 12 +++++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index 7f352b65a4..a1095c1026 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -68,11 +68,8 @@ class projectrelease extends control
         $showBranch = false;
         foreach($releases as $release)
         {
-            if($release->productType != 'normal')
-            {
-                $showBranch = true;
-                break;
-            }
+            $release->desc = strip_tags($release->desc);
+            if($release->productType != 'normal') $showBranch = true;
         }
 
         $project   = $this->project->getByID($projectID);
diff --git a/module/projectrelease/ui/browse.html.php b/module/projectrelease/ui/browse.html.php
index 1debb8ffb4..b0f3f8dce5 100644
--- a/module/projectrelease/ui/browse.html.php
+++ b/module/projectrelease/ui/browse.html.php
@@ -31,15 +31,17 @@ toolbar
 jsVar('markerTitle', $lang->release->marker);
 jsVar('canViewProjectbuild', hasPriv('projectbuild', 'view'));
 
-if(!$showBranch) unset($config->projectrelease->dtable->fieldList['branch']);
-$config->projectrelease->dtable->fieldList['product']['map'] = $products;
-if(empty($project->hasProduct)) unset($config->projectrelease->dtable->fieldList['product']);
+$cols = $this->loadModel('datatable')->getSetting('projectrelease');
+if(!$showBranch) unset($cols['branch']);
+$cols['product']['map'] = $products;
+if(empty($project->hasProduct)) unset($cols['product']);
 
-$tableData = initTableData($releases, $config->projectrelease->dtable->fieldList);
+$tableData = initTableData($releases, $cols);
 dtable
 (
-    set::cols($config->projectrelease->dtable->fieldList),
+    set::cols(array_values($cols)),
     set::data($tableData),
+    set::customCols(true),
     set::fixedLeftWidth('0.33'),
     set::onRenderCell(jsRaw('window.renderCell')),
     set::sortLink(createLink('projectrelease', 'browse', "projectID={$project->id}&executionID={$executionID}&type={$type}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),