diff --git a/module/testtask/control.php b/module/testtask/control.php index e3c6dbbba2..6d5dc1e727 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -655,7 +655,7 @@ class testtask extends control $this->view->position[] = $this->lang->testtask->common; $this->view->position[] = $this->lang->testtask->linkCase; - $testTask = $this->testtask->getRelatedTestTasks($productID, $param); + $testTask = $this->testtask->getRelatedTestTasks($productID, $taskID); /* Get cases. */ $cases = $this->testtask->getLinkableCases($productID, $task, $taskID, $type, $param, $pager); diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index ffa375e9fe..2a05b7154b 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -74,7 +74,7 @@ $lang->testtask->priList[2] = '2'; $lang->testtask->priList[4] = '4'; $lang->testtask->unlinkedCases = '未关联'; -$lang->testtask->linkByVersion = '按版本复制'; +$lang->testtask->linkByVersion = '复制版本'; $lang->testtask->linkByStory = '按需求关联'; $lang->testtask->linkByBug = '按Bug关联'; $lang->testtask->linkBySuite = '按套件关联'; diff --git a/module/testtask/model.php b/module/testtask/model.php index bb01874172..018b9fc6d2 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -203,7 +203,7 @@ class testtaskModel extends model if($type == 'all') $cases = $this->getAllLinkableCases($task, $query, $linkedCases, $pager); if($type == 'bystory') $cases = $this->getLinkableCasesByStory($productID, $task, $query, $linkedCases, $pager); if($type == 'bybug') $cases = $this->getLinkableCasesByBug($productID, $task, $query, $linkedCases, $pager); - if($type == 'bysuite') $cases = $this->getLinkableCasesBySuite($productID, $query, $param, $linkedCases, $pager); + if($type == 'bysuite') $cases = $this->getLinkableCasesBySuite($productID, $task, $query, $param, $linkedCases, $pager); if($type == 'bybuild') $cases = $this->getLinkableCasesByTestTask($param, $linkedCases, $pager); return $cases; @@ -296,6 +296,7 @@ class testtaskModel extends model * Get linkable cases by suite. * * @param int $productID + * @param object $task * @param string $query * @param string $suite * @param array $linkedCases @@ -303,7 +304,7 @@ class testtaskModel extends model * @access public * @return array */ - public function getLinkableCasesBySuite($productID, $query, $suite, $linkedCases, $pager) + public function getLinkableCasesBySuite($productID, $task, $query, $suite, $linkedCases, $pager) { return $this->dao->select('t1.*,t2.version as version')->from(TABLE_CASE)->alias('t1') ->leftJoin(TABLE_SUITECASE)->alias('t2')->on('t1.id=t2.case') diff --git a/module/testtask/view/caseheader.html.php b/module/testtask/view/caseheader.html.php index a1f3ba4f44..417c0a54cd 100644 --- a/module/testtask/view/caseheader.html.php +++ b/module/testtask/view/caseheader.html.php @@ -48,7 +48,7 @@
"; - common::printIcon('testtask', 'linkCase', "taskID=$task->id&type=all¶m=$taskID", '', 'button', 'link'); + common::printIcon('testtask', 'linkCase', "taskID=$task->id", '', 'button', 'link'); common::printIcon('testcase', 'export', "productID=$productID&orderBy=`case`_desc&taskID=$task->id", '', 'button', '', '', 'iframe export'); echo '
'; echo "
"; diff --git a/module/testtask/view/linkcase.html.php b/module/testtask/view/linkcase.html.php index 1ca964ee6f..f51f43fb98 100644 --- a/module/testtask/view/linkcase.html.php +++ b/module/testtask/view/linkcase.html.php @@ -22,23 +22,6 @@ $lang->testtask->linkCase = $lang->testtask->linkByStory; common::printIcon('testtask', 'linkCase', "taskID=$taskID&type=bystory", '', 'button', '', '', 'btn-primary btn-sm'); - echo ""; - echo ""; - echo ""; - echo ""; echo ""; echo ""; + echo ""; + echo ""; + echo ""; //$lang->testtask->linkCase = $lang->testtask->linkByBug; //common::printIcon('testtask', 'linkCase', "taskID=$taskID&type=bybug", '', 'button', 'link'); ?>