From 1590364db361c99081574ba86014f36993b8a221 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 23 Aug 2022 15:23:17 +0800
Subject: [PATCH] * Fix bug of link story.

---
 module/story/model.php          | 17 +++++++++--------
 module/story/view/edit.html.php |  2 --
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/module/story/model.php b/module/story/model.php
index 4b6bd024e1..8bf1f76223 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3056,6 +3056,15 @@ class storyModel extends model
             if(empty($normalProducts) and empty($branchProducts)) $storyQuery .= '1 = 1';
             $storyQuery .= ') ';
 
+            if($this->app->moduleName == 'release' or $this->app->moduleName == 'build')
+            {
+                $storyQuery .= " AND `status` NOT IN ('draft')"; // Fix bug #990.
+            }
+            else
+            {
+                $storyQuery .= " AND `status` NOT IN ('draft', 'closed')";
+            }
+
             if($this->app->rawModule == 'build' and $this->app->rawMethod == 'linkstory') $storyQuery .= " AND `parent` != '-1'";
         }
         elseif(strpos($storyQuery, $allBranch) !== false)
@@ -3068,14 +3077,6 @@ class storyModel extends model
         }
         $storyQuery = preg_replace("/`plan` +LIKE +'%([0-9]+)%'/i", "CONCAT(',', `plan`, ',') LIKE '%,$1,%'", $storyQuery);
 
-        if($this->app->moduleName == 'release' or $this->app->moduleName == 'build')
-        {
-            $storyQuery .= " AND `status` NOT IN ('draft', 'reviewing')"; // Fix bug #990.
-        }
-        else
-        {
-            $storyQuery .= " AND `status` NOT IN ('draft', 'reviewing', 'closed')";
-        }
 
         return $this->getBySQL($queryProductID, $storyQuery, $orderBy, $pager, $type);
     }
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 501c615142..7ba57f8114 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -280,7 +280,6 @@
 
           <?php $this->printExtendFields($story, 'div', 'position=right');?>
 
-          <?php if($story->status == 'closed'):?>
           <div class='detail'>
             <div class='detail-title'><?php echo $lang->story->legendMisc;?></div>
             <table class='table table-form'>
@@ -318,7 +317,6 @@
               </tr>
            </table>
           </div>
-          <?php endif;?>
         </div>
       </div>
     </div>