From 92ad301e291ca47819fb2faf89b697a3b1b033dc Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 1 Dec 2021 17:16:52 +0800
Subject: [PATCH] * Fix bug #16988.

---
 module/execution/view/importbug.html.php | 4 ++--
 module/testcase/control.php              | 5 ++++-
 module/testcase/model.php                | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/execution/view/importbug.html.php b/module/execution/view/importbug.html.php
index 1d314a1c7b..b2fc7eafb1 100755
--- a/module/execution/view/importbug.html.php
+++ b/module/execution/view/importbug.html.php
@@ -17,7 +17,7 @@
 $(function(){$(".preview").modalTrigger({width:1000, type:'iframe'});});
 var browseType = '<?php echo $browseType;?>';
 </script>
-<style>#importBugForm .bugPri {overflow: visible;}</style>
+<style>#importBugForm .bug-pri {overflow: visible;}</style>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php echo html::a(inlink('importBug', "executionID=$executionID"), "<span class='text'>{$lang->execution->importBug}</span>", '', "class='btn btn-link btn-active-text'");?>
@@ -61,7 +61,7 @@ var browseType = '<?php echo $browseType;?>';
           <td><span class='label-pri <?php echo 'label-pri-' . $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri)?></span></td>
           <td class='nobr'><?php common::printLink('bug', 'view', "bugID=$bug->id", $bug->title, '', "class='preview'", true, true);?></td>
           <td><span class='status-bug status-<?php echo $bug->status?>'><?php echo $this->processStatus('bug', $bug);?></span></td>
-          <td class='bugPri'><?php echo html::select("pri[$bug->id]", $lang->task->priList, zget($lang->task->priList, $bug->pri ? $bug->pri : 3, 3), "class='form-control chosen'");?></td>
+          <td class='bug-pri'><?php echo html::select("pri[$bug->id]", $lang->task->priList, zget($lang->task->priList, $bug->pri ? $bug->pri : 3, 3), "class='form-control chosen'");?></td>
           <td style='overflow:visible'><?php echo html::select("assignedTo[$bug->id]", $users, zget($users, $bug->assignedTo, '', $bug->assignedTo), "class='form-control chosen'");?></td>
           <td><?php echo html::input("estimate[$bug->id]", '', 'size=4 class="form-control"');?></td>
           <?php $deadline = ($bug->deadline > helper::today() and $bug->deadline > $execution->begin) ? $bug->deadline : '0000-00-00';?>
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 1ef355c321..5710c60b0d 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1238,7 +1238,10 @@ class testcase extends control
 
         /* Build the search form. */
         $actionURL = $this->createLink('testcase', 'linkCases', "caseID=$caseID&browseType=bySearch&queryID=myQueryID", '', true);
-        $this->testcase->buildSearchForm($case->product, $this->products, $queryID, $actionURL);
+        $objectID  = 0;
+        if($this->app->tab == 'project') $objectID = $case->project;
+        if($this->app->tab == 'execution') $objectID = $case->execution;
+        $this->testcase->buildSearchForm($case->product, $this->products, $queryID, $actionURL, $objectID);
 
         /* Get cases to link. */
         $cases2Link = $this->testcase->getCases2Link($caseID, $browseType, $queryID);
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 720de4e798..d622bca03d 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1450,7 +1450,7 @@ class testcaseModel extends model
      * @access public
      * @return void
      */
-    public function buildSearchForm($productID, $products, $queryID, $actionURL, $projectID)
+    public function buildSearchForm($productID, $products, $queryID, $actionURL, $projectID = 0)
     {
         $product = ($this->app->tab == 'project' and empty($productID)) ? $products : array($productID => $products[$productID]) + array('all' => $this->lang->testcase->allProduct);
         $this->config->testcase->search['params']['product']['values'] = $product;