From 178ea59c4eef53523fb79bb2744e84718705daaf Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Wed, 20 Jul 2022 02:30:19 +0000 Subject: [PATCH] * Finish task #61441. --- module/task/config.php | 2 +- module/task/control.php | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/module/task/config.php b/module/task/config.php index 7b488a6f5b..5b5d8f08cf 100644 --- a/module/task/config.php +++ b/module/task/config.php @@ -28,7 +28,7 @@ $config->task->editor->pause = array('id' => 'comment', 'tools' => 'simpleToo $config->task->removeFields = 'objectTypeList,productList,executionList,gitlabID,gitlabProjectID,product'; $config->task->exportFields = ' - id, execution, module, story, + id, execution, module, fromBug, story, name, desc, type, pri,estStarted, realStarted, deadline, status,estimate, consumed, left, mailto, progress, mode, diff --git a/module/task/control.php b/module/task/control.php index 8bd42239c2..69e134dd5c 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -2203,6 +2203,9 @@ class task extends control /* fill some field with useful value. */ $task->story = isset($relatedStories[$task->story]) ? $relatedStories[$task->story] . "(#$task->story)" : ''; + $bug = $this->loadModel('bug')->getByID($task->fromBug); + $task->fromBug = empty($task->fromBug) ? '0' : "#$task->fromBug " . $bug->title; + if(isset($executions[$task->execution])) $task->execution = $executions[$task->execution] . "(#$task->execution)"; if(isset($taskLang->typeList[$task->type])) $task->type = $taskLang->typeList[$task->type]; if(isset($taskLang->priList[$task->pri])) $task->pri = $taskLang->priList[$task->pri];