From 415542746bad6aed78ca4cee0dafec05c7dfeb12 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 9 Jun 2022 14:54:54 +0800
Subject: [PATCH] * Fix bug #23374.

---
 module/story/model.php  | 1 +
 module/task/control.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index f5bea613da..637b91aad8 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -2986,6 +2986,7 @@ class storyModel extends model
             ->beginIF($moduleIdList)->andWhere('t2.module')->in($moduleIdList)->fi()
             ->beginIF($status == 'unclosed')->andWhere('t2.status')->ne('closed')->fi()
             ->beginIF($status == 'review')->andWhere('t2.status')->in('draft,changed')->fi()
+            ->beginIF($status == 'active')->andWhere('t2.status')->eq('active')->fi()
             ->orderBy('t1.`order` desc, t1.`story` desc')
             ->fetchAll('id');
         return empty($stories) ? array() : $this->formatStories($stories, $type);
diff --git a/module/task/control.php b/module/task/control.php
index 118eac8e05..693ee426d7 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -240,7 +240,7 @@ class task extends control
             if(!isset($moduleOptionMenu[$task->module])) $task->module = 0;
         }
 
-        $stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', '', 'full', 'unclosed');
+        $stories = $this->story->getExecutionStoryPairs($executionID, 0, 'all', '', 'full', 'active');
 
         /* Get block id of assinge to me. */
         $blockID = 0;
@@ -537,7 +537,7 @@ class task extends control
         $this->view->title         = $this->lang->task->edit . 'TASK' . $this->lang->colon . $this->view->task->name;
         $this->view->position[]    = $this->lang->task->common;
         $this->view->position[]    = $this->lang->task->edit;
-        $this->view->stories       = $this->story->getExecutionStoryPairs($this->view->execution->id);
+        $this->view->stories       = $this->story->getExecutionStoryPairs($this->view->execution->id, 0, 'all', '', 'full', 'active');
         $this->view->tasks         = $tasks;
         $this->view->users         = $this->loadModel('user')->getPairs('nodeleted', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}");
         $this->view->showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';