From 049ae60320d87743dce19dfddf3fb71c01b99519 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Tue, 23 Nov 2021 17:30:37 +0800
Subject: [PATCH 1/2] * Fix bug #16642.

---
 module/testtask/control.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 98b1864063..d3e03b3244 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -766,7 +766,8 @@ class testtask extends control
         $productID   = $productID ? $productID : key($this->products);
         $projectID   = $this->lang->navGroup->testtask == 'qa' ? 0 : $this->session->project;
         $executions  = empty($productID) ? array() : $this->product->getExecutionPairsByProduct($productID, 0, 'id_desc', $projectID);
-        $builds      = empty($productID) ? array() : $this->loadModel('build')->getProductBuildPairs($productID, 0, 'notrunk', true);
+        $executionID = $task->execution;
+        $builds      = empty($productID) ? array() : $this->loadModel('build')->getExecutionBuildPairs($executionID, $productID, 'all', 'noempty,notrunk');
         $testreports = $this->testtask->getTestReportPairsByBuild($task->build);
 
         $this->view->task         = $task;

From 35bdfa93760fdca5737c952c0e7d61bdb5871fec Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Tue, 23 Nov 2021 17:32:40 +0800
Subject: [PATCH 2/2] * Fix bug#16565.

---
 module/my/view/story.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php
index 912373715c..15b028fb24 100644
--- a/module/my/view/story.html.php
+++ b/module/my/view/story.html.php
@@ -142,7 +142,7 @@
             if($canBeChanged)
             {
                 $vars = "story={$child->id}";
-                common::printIcon('story', 'change',     $vars, $child, 'list', 'alter');
+                common::printIcon('story', 'change',     $vars, $child, 'list', 'alter', '', 'iframe', true);
                 common::printIcon('story', 'review',     $vars, $child, 'list', 'search');
                 common::printIcon('story', 'close',      $vars, $child, 'list', '', '', 'iframe', true);
                 common::printIcon('story', 'edit',       $vars, $child, 'list', '', '', 'iframe', true, "data-width='95%'");