From ad66c56b0ac801803f8447ca1d7d3dde8a29b115 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 27 Aug 2021 15:19:52 +0800
Subject: [PATCH] * Finish task#41691

---
 module/build/control.php     | 2 +-
 module/testtask/js/common.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/build/control.php b/module/build/control.php
index 55f08f80c2..6856719a12 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -38,7 +38,7 @@ class build extends control
             $this->executeHooks($buildID);
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $buildID));
-            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadExecutionBuilds($executionID)")); // Code for task #5126.
+            if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.loadExecutionBuilds($executionID, $buildID)")); // Code for task #5126.
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('build', 'view', "buildID=$buildID")));
         }
 
diff --git a/module/testtask/js/common.js b/module/testtask/js/common.js
index 848fe6be67..f3fde3fd0d 100644
--- a/module/testtask/js/common.js
+++ b/module/testtask/js/common.js
@@ -81,7 +81,7 @@ function loadExecutionRelated(executionID)
  * @access public
  * @return void
  */
-function loadExecutionBuilds(executionID)
+function loadExecutionBuilds(executionID, selected)
 {
     selectedBuild = $('#build').val();
     if(!selectedBuild) selectedBuild = 0;
@@ -90,6 +90,7 @@ function loadExecutionBuilds(executionID)
     $('#buildBox').load(link, function()
     {
         $('#resolvedBuild').attr('id', 'build').attr('name', 'build').find('option[value=trunk]').remove();
+        if(selected) $('#build').val(selected);
         $('#build').chosen();
     });
 }