From 456dbffd68a46025e44d6ff32afc3cd8adf5119d Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Tue, 29 Sep 2020 08:25:38 +0800
Subject: [PATCH] * Fix bug #2526.

---
 module/bug/js/common.js       | 14 +++++---------
 module/bug/view/edit.html.php |  2 +-
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index ac8298ecd2..c2a346a3f2 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -97,11 +97,10 @@ function loadBranch()
   *Load all builds of one project or product.
   *
   * @param  that $that
-  * @param  bool $resolvedBuildBox
   * @access public
   * @return void
   */
-function loadAllBuilds(that, resolvedBuildBox)
+function loadAllBuilds(that)
 {
     that             = (typeof that == undefined) ? undefined : that;
     resolvedBuildBox = (typeof resolvedBuildBox == undefined) ? false : resolvedBuildBox;
@@ -118,15 +117,13 @@ function loadAllBuilds(that, resolvedBuildBox)
         projectID = $('#project').val();
         if(page == 'edit') buildBox = $(that).closest('.input-group').attr('id');
 
-        if(resolvedBuildBox) loadAllProductBuilds(productID, 'resolvedBuildBox');
-
         if(projectID)
         {
             loadAllProjectBuilds(projectID, productID);
         }
         else
         {
-            loadAllProductBuilds(productID, 'openedBuildBox');
+            loadAllProductBuilds(productID);
         }
     }
 }
@@ -166,7 +163,7 @@ function loadAllProjectBuilds(projectID, productID)
         }
         if(buildBox == 'resolvedBuildBox')
         {
-            link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=0&index=0&needCreate=true&type=all');
+            link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=' + branch + '&index=0&type=all');
             $('#resolvedBuildBox').load(link, function(){$(this).find('select').chosen()});
         }
     }
@@ -176,11 +173,10 @@ function loadAllProjectBuilds(projectID, productID)
   * Load all builds of the product.
   *
   * @param  int    $productID
-  * @param  string $buildBox
   * @access public
   * @return void
   */
-function loadAllProductBuilds(productID, buildBox)
+function loadAllProductBuilds(productID)
 {
     branch = $('#branch').val();
     if(typeof(branch) == 'undefined') branch = 0;
@@ -206,7 +202,7 @@ function loadAllProductBuilds(productID, buildBox)
         }
         if(buildBox == 'resolvedBuildBox')
         {
-            link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch' + branch);
+            link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch' + branch + '&index=0&type=all');
             $('#resolvedBuildBox').load(link, function(){$(this).find('select').chosen()});
         }
     }
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 6e19d458e9..56e9dd3d84 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -220,7 +220,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                   <td>
                     <div id='resolvedBuildBox' class='input-group'>
                       <?php echo html::select('resolvedBuild', $resolvedBuilds, $bug->resolvedBuild, "class='form-control chosen'");?>
-                      <span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' onclick='loadAllBuilds(this, true)'")?></span>
+                      <span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' onclick='loadAllBuilds(this)'")?></span>
                     </div>
                   </td>
                 </tr>