From fc707e64305e6c2b77a8b914ff13fc4611f091b1 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 2 Aug 2023 11:54:19 +0800
Subject: [PATCH] + Finish task #99348.

---
 module/execution/model.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/module/execution/model.php b/module/execution/model.php
index 6fe6ab8ab7..f797a261e4 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -5052,6 +5052,8 @@ class executionModel extends model
                     $node->tasksCount += count($taskItems);
                     foreach($taskItems as $taskItem)
                     {
+                        if($taskItem->story > 0) continue; // If a story link to task, display task in story tree.
+
                         $node->children[$taskItem->id] = $taskItem;
                         if(!empty($tasks[$taskItem->id]->children))
                         {
@@ -5099,6 +5101,7 @@ class executionModel extends model
             $taskItem->pri          = (int)$task->pri;
             $taskItem->status       = $task->status;
             $taskItem->parent       = $task->parent;
+            $taskItem->story        = $task->story;
             $taskItem->estimate     = $task->estimate;
             $taskItem->consumed     = $task->consumed;
             $taskItem->left         = $task->left;