diff --git a/module/testtask/control.php b/module/testtask/control.php index c67682d669..fe2c27e80c 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -861,7 +861,21 @@ class testtask extends control $this->loadModel('testcase'); $this->config->testcase->search['params']['product']['values']= array($productID => $this->products[$productID]); $this->config->testcase->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'case'); - $this->config->testcase->search['actionURL'] = inlink('linkcase', "taskID=$taskID"); + $this->config->testcase->search['actionURL'] = inlink('linkcase', "taskID=$taskID&type=$type¶m=myQueryID"); + $this->config->testcase->search['queryID'] = $param; + if($param) + { + $query = $this->loadModel('search')->getQuery($param); + if($query) + { + $this->session->set('testcaseQuery', $query->sql); + $this->session->set('testcaseForm', $query->form); + } + else + { + $this->session->set('testcaseQuery', ' 1 = 1'); + } + } if($this->session->currentProductType == 'normal') { unset($this->config->testcase->search['fields']['branch']); diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php index b2908073a8..b9f8ddfbc1 100644 --- a/module/testtask/view/browse.html.php +++ b/module/testtask/view/browse.html.php @@ -103,7 +103,7 @@ $status = $this->session->testTaskVersionStatus; '; common::printIcon('testtask', 'cases', "taskID=$task->id", $task, 'list', 'sitemap'); - common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link'); + common::printIcon('testtask', 'linkCase', "taskID=$task->id&type=all¶m=myQueryID", $task, 'list', 'link'); common::printIcon('testreport', 'browse', "objectID=$task->product&objectType=product&extra=$task->id", $task, 'list','flag'); echo ''; common::printIcon('testtask', 'view', "taskID=$task->id", '', 'list', 'list-alt','','iframe',true);