From fa63b6dc43f9976c904f696674fdae3ab6e05601 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Thu, 17 Sep 2020 11:20:05 +0800
Subject: [PATCH] * Finish task#7948.

---
 module/bug/js/common.js  | 5 +++--
 module/bug/js/create.js  | 3 ++-
 module/bug/js/edit.js    | 3 ++-
 module/story/control.php | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index f1e8585004..f92d993c10 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -415,14 +415,15 @@ function loadProjectBuilds(projectID)
  * 
  * @param  moduleID $moduleID 
  * @param  productID $productID 
+ * @param  storyID $storyID
  * @access public
  * @return void
  */
-function setStories(moduleID, productID)
+function setStories(moduleID, productID, storyID)
 {
     var branch = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
-    link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID);
+    link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID=' + storyID);
     $.get(link, function(stories)
     {
         if(!stories) stories = '<select id="story" name="story" class="form-control"></select>';
diff --git a/module/bug/js/create.js b/module/bug/js/create.js
index f38e1376cd..f89fc3118c 100644
--- a/module/bug/js/create.js
+++ b/module/bug/js/create.js
@@ -42,8 +42,9 @@ function loadModuleRelated()
 {
     var moduleID  = $('#module').val();
     var productID = $('#product').val();
+    var storyID   = $('#story').val();
     setAssignedTo(moduleID, productID);
-    setStories(moduleID, productID);
+    setStories(moduleID, productID, storyID);
 }
 
 /**
diff --git a/module/bug/js/edit.js b/module/bug/js/edit.js
index 994831ae60..1a7fba0c17 100644
--- a/module/bug/js/edit.js
+++ b/module/bug/js/edit.js
@@ -52,5 +52,6 @@ function loadModuleRelated()
 {
     moduleID  = $('#module').val();
     productID = $('#product').val();
-    setStories(moduleID, productID);
+    storyID   = $('#story').val();
+    setStories(moduleID, productID, storyID);
 }
diff --git a/module/story/control.php b/module/story/control.php
index c013e93e34..389ad19ca0 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1503,6 +1503,8 @@ class story extends control
         }
 
         $stories = $this->story->getProductStoryPairs($productID, $branch ? "0,$branch" : $branch, $moduleID, $storyStatus, 'id_desc', $limit, $type, 'story', $hasParent);
+
+        $storyID = isset($stories[$storyID]) ? $storyID : 0;
         $select  = html::select('story', empty($stories) ? array('' => '') : $stories, $storyID, "class='form-control'");
 
         /* If only need options, remove select wrap. */