From bce4e3267b4d91bdb61443f308ef856a6e2a33c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Tue, 19 Apr 2022 15:27:58 +0800
Subject: [PATCH] * Fix bug #18898.

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

diff --git a/module/project/control.php b/module/project/control.php
index e687df1e20..0182096061 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -480,7 +480,7 @@ class project extends control
             $products = $this->product->getProducts($copyProjectID);
             foreach($products as $product)
             {
-                $productPlans[$product->id] = $this->loadModel('productplan')->getPairs($product->id);
+                $productPlans[$product->id] = $this->loadModel('productplan')->getPairs($product->id, '','noclosed');
             }
         }
 
diff --git a/module/story/control.php b/module/story/control.php
index 1652a7d852..e14c548a59 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -347,7 +347,7 @@ class story extends control
         $this->view->users            = $users;
         $this->view->moduleID         = $moduleID ? $moduleID : (int)$this->cookie->lastStoryModule;
         $this->view->moduleOptionMenu = $moduleOptionMenu;
-        $this->view->plans            = str_replace('2030-01-01', $this->lang->story->undetermined, $this->loadModel('productplan')->getPairsForStory($productID, $branch, 'skipParent|unexpired'));
+        $this->view->plans            = str_replace('2030-01-01', $this->lang->story->undetermined, $this->loadModel('productplan')->getPairsForStory($productID, $branch, 'skipParent|unexpired|noclosed'));
         $this->view->planID           = $planID;
         $this->view->source           = $source;
         $this->view->sourceNote       = $sourceNote;
@@ -536,7 +536,7 @@ class story extends control
             }
             $this->view->titles = $titles;
         }
-        $plans          = $this->loadModel('productplan')->getPairsForStory($productID, ($branch === 'all' or !in_array($branch, array_keys($branches))) ? 0 : $branch, 'skipParent|unexpired');
+        $plans          = $this->loadModel('productplan')->getPairsForStory($productID, ($branch === 'all' or !in_array($branch, array_keys($branches))) ? 0 : $branch, 'skipParent|unexpired|noclosed');
         $plans['ditto'] = $this->lang->story->ditto;
 
         $priList          = (array)$this->lang->story->priList;