From 5f0e829b03b215486bd25e6461309c0b74fb9e49 Mon Sep 17 00:00:00 2001
From: chaideqing <chaideqing@easycorp.ltd>
Date: Mon, 30 Oct 2023 08:51:56 +0000
Subject: [PATCH] * Fix bug #39577.

---
 module/bug/control.php        |  1 -
 module/bug/js/edit.js         | 16 ++++++++++++++++
 module/bug/view/edit.html.php |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index bf856b4913..9efa33eed8 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -1193,7 +1193,6 @@ class bug extends control
         $this->view->executions            = $executions;
         $this->view->branchOption          = $branchOption;
         $this->view->branchTagOption       = $branchTagOption;
-        $this->view->tasks                 = $this->task->getExecutionTaskPairs($bug->execution);
         $this->view->testtasks             = $this->loadModel('testtask')->getPairs($bug->product, $bug->execution, $bug->testtask);
         $this->view->users                 = $this->user->getPairs('noclosed', "$bug->assignedTo,$bug->resolvedBy,$bug->closedBy,$bug->openedBy");
         $this->view->assignedToList        = $assignedToList;
diff --git a/module/bug/js/edit.js b/module/bug/js/edit.js
index 905f5696fd..14085811f7 100644
--- a/module/bug/js/edit.js
+++ b/module/bug/js/edit.js
@@ -18,6 +18,7 @@ $(function()
     renderBuilds();
     renderTestTasks();
     renderStories();
+    renderTasks();
 
     $('#duplicateBug').picker(
     {
@@ -44,6 +45,21 @@ $(function()
     $pkResolvedBuild.closest('.picker').css('width', $pkResolvedBuild.closest('td').width() - $pkResolvedBuild.closest('td').find('.input-group-btn').width());
 });
 
+/**
+ * Render tasks.
+ *
+ * @access public
+ * @return void
+ */
+function renderTasks()
+{
+    executionID = $('#execution').val();
+    if(executionID)
+    {
+        loadExecutionTasks(executionID);
+    }
+}
+
 /**
  * Get all builds and set confirm string.
  *
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 950c1e5839..764dbe1704 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -226,7 +226,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->task;?></th>
-                  <td><div id='taskIdBox'><?php echo html::select('task', $tasks, $bug->task, "class='form-control chosen' data-max_drop_width=100%");?></div></td>
+                  <td><div id='taskIdBox'><?php echo html::select('task', array(), '', "class='form-control picker-select' data-max_drop_width=100%");?></div></td>
                 </tr>
               </tbody>
             </table>