From 8e46671c2005f49721ac6770cada5ca86a20ccc3 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 20 Jul 2022 03:07:38 +0000
Subject: [PATCH] * Finish task #61441.

---
 module/task/config.php  | 2 +-
 module/task/control.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/task/config.php b/module/task/config.php
index 5b5d8f08cf..611a34e32c 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, fromBug, story,
+    id, execution, module, story, fromBug,
     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 69e134dd5c..7baf3989a6 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -2204,7 +2204,7 @@ class task extends control
                 $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;
+                $task->fromBug = empty($task->fromBug) ? '' : "#$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];