From 92da7aa0dd250992643f6cd225c66eda17c552f1 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Wed, 28 Apr 2021 09:46:55 +0800
Subject: [PATCH] * Fix the issue of the module that created the bug.

---
 module/bug/js/common.js         | 3 ++-
 module/bug/view/create.html.php | 1 +
 module/tree/control.php         | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 92ff94764e..a3699ef386 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -209,7 +209,8 @@ function loadProductModules(productID)
 {
     branch = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
-    link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=&needManage=true');
+    if(typeof(moduleID) == 'undefined') moduleID = 0;
+    link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=bug&branch=' + branch + '&rootModuleID=0&returnType=html&fieldID=&needManage=true&extra=&currentModuleID=' + moduleID);
     $('#moduleIdBox').load(link, function()
     {
         $(this).find('select').chosen()
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 7dba03779c..a742898300 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -25,6 +25,7 @@ js::set('stepsNotEmpty', $lang->bug->stepsNotEmpty);
 js::set('isStepsTemplate', $isStepsTemplate);
 js::set('oldProjectID', $projectID);
 js::set('blockID', $blockID);
+js::set('moduleID', $moduleID);
 ?>
 <div id="mainContent" class="main-content fade">
   <div class="center-block">
diff --git a/module/tree/control.php b/module/tree/control.php
index d1d3686718..eaf069b278 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -419,10 +419,12 @@ class tree extends control
      * @param  string $returnType
      * @param  string $fieldID
      * @param  bool   $needManage
+     * @param  string $extra
+     * @param  int    $currentModuleID
      * @access public
      * @return string the html select string.
      */
-    public function ajaxGetOptionMenu($rootID, $viewType = 'story', $branch = 0, $rootModuleID = 0, $returnType = 'html', $fieldID = '', $needManage = false, $extra = '')
+    public function ajaxGetOptionMenu($rootID, $viewType = 'story', $branch = 0, $rootModuleID = 0, $returnType = 'html', $fieldID = '', $needManage = false, $extra = '', $currentModuleID = 0)
     {
         if($viewType == 'task')
         {
@@ -448,7 +450,7 @@ class tree extends control
                 $changeFunc = '';
                 if($viewType == 'task' or $viewType == 'bug' or $viewType == 'case') $changeFunc = "onchange='loadModuleRelated()'";
                 $field = $fieldID ? "modules[$fieldID]" : 'module';
-                $output = html::select("$field", $optionMenu, '', "class='form-control' $changeFunc");
+                $output = html::select("$field", $optionMenu, $currentModuleID, "class='form-control' $changeFunc");
                 if(count($optionMenu) == 1 and $needManage)
                 {
                     $output .=  "<span class='input-group-addon'>";