From 36fd4cee71e23626d5ccd3c0849336b028000a9e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 7 May 2024 16:50:14 +0800
Subject: [PATCH] * Fix bug #48759.

---
 lib/zin/wg/taskbasicinfo/v1.php   | 5 +++++
 module/execution/js/task.ui.js    | 5 +++++
 module/execution/ui/task.html.php | 1 +
 module/task/config/dtable.php     | 5 ++---
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/zin/wg/taskbasicinfo/v1.php b/lib/zin/wg/taskbasicinfo/v1.php
index 74f6857f4f..88dabf5132 100644
--- a/lib/zin/wg/taskbasicinfo/v1.php
+++ b/lib/zin/wg/taskbasicinfo/v1.php
@@ -74,6 +74,11 @@ class taskBasicInfo extends wg
             'items' => $this->getModuleItems($task, $product)
         );
 
+        if($config->edition == 'max' && $execution->type == 'stage')
+        {
+            $items[$lang->task->design] = array('control' => 'text', 'text' => $task->designName, 'title' => $task->designName, 'control' => 'link', 'url' => createLink('design', 'view', "designID=$task->design"));
+        }
+
         $items[$lang->task->fromBug] = array
         (
             'control'   => 'entityTitle',
diff --git a/module/execution/js/task.ui.js b/module/execution/js/task.ui.js
index b2e75d8531..e608aa5090 100644
--- a/module/execution/js/task.ui.js
+++ b/module/execution/js/task.ui.js
@@ -152,6 +152,11 @@ window.renderCell = function(result, info)
     }
 
     if(['estimate', 'consumed','left'].includes(info.col.name) && result) result[0] = {html: result[0] + ' h'};
+    if(info.col.name == 'design')
+    {
+        result[0] = {html: task.designName};
+        result[1].attrs['title'] = task.designName;
+    }
 
     return result;
 }
diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php
index e3a97101d3..3de597feac 100644
--- a/module/execution/ui/task.html.php
+++ b/module/execution/ui/task.html.php
@@ -52,6 +52,7 @@ if(common::canModify('execution', $execution))
 
 $cols = $this->loadModel('datatable')->getSetting('execution');
 if($execution->type != 'stage') unset($cols['design']);
+
 $tableData = initTableData($tasks, $cols, $this->task);
 $tableData = array_map(
     function($task)
diff --git a/module/task/config/dtable.php b/module/task/config/dtable.php
index c27f385d83..017006128b 100644
--- a/module/task/config/dtable.php
+++ b/module/task/config/dtable.php
@@ -191,9 +191,8 @@ $config->task->dtable->fieldList['mailto']['delimiter'] = ',';
 
 if($config->edition == 'max')
 {
-    $config->task->dtable->fieldList['design']['title']      = $lang->task->design;
-    $config->task->dtable->fieldList['design']['type']       = 'text';
-    $config->task->dtable->fieldList['design']['dataSource'] = array('module' => 'story', 'method' => 'getDesignPairs', 'params' => ['projectID' => 0, 'storyID' => 0]);
+    $config->task->dtable->fieldList['design']['title'] = $lang->task->design;
+    $config->task->dtable->fieldList['design']['type']  = 'text';
 }
 
 $config->task->dtable->fieldList['actions']['type']     = 'actions';