From 2820ee43d7911bf5e0d148429286e3d1b91c187f Mon Sep 17 00:00:00 2001
From: Yagami <976204163@qq.com>
Date: Tue, 16 Mar 2021 09:48:30 +0800
Subject: [PATCH] * Fix testcase link.

---
 framework/base/control.class.php   | 7 +++++--
 module/user/view/testcase.html.php | 4 ++--
 module/user/view/testtask.html.php | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/framework/base/control.class.php b/framework/base/control.class.php
index 13aebfc8ac..17dd3bfb10 100644
--- a/framework/base/control.class.php
+++ b/framework/base/control.class.php
@@ -927,13 +927,16 @@ class baseControl
      * @param   string         $methodName    method name
      * @param   string|array   $vars          the params passed, can be array(key=>value) or key1=value1&key2=value2
      * @param   string         $viewType      the view type
+     * @param   string         $onlybody      remove header and footer or not in iframe
+     * @param   string         $PRJID         the project id 
+     * @param   string         $removePRJ     if remove PRJ param 
      * @access  public
      * @return  string the link string.
      */
-    public function createLink($moduleName, $methodName = 'index', $vars = array(), $viewType = '', $onlybody = false, $PRJID = 0)
+    public function createLink($moduleName, $methodName = 'index', $vars = array(), $viewType = '', $onlybody = false, $PRJID = 0, $removePRJ = false)
     {
         if(empty($moduleName)) $moduleName = $this->moduleName;
-        return helper::createLink($moduleName, $methodName, $vars, $viewType, $onlybody, $PRJID);
+        return helper::createLink($moduleName, $methodName, $vars, $viewType, $onlybody, $PRJID, $removePRJ);
     }
 
     /**
diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php
index 8aa687ab1d..8eb7ce84de 100755
--- a/module/user/view/testcase.html.php
+++ b/module/user/view/testcase.html.php
@@ -49,9 +49,9 @@
         <?php foreach($cases as $case):?>
         <?php $caseID = $type == 'case2Him' ? $case->case : $case->id?>
         <tr class='text-left'>
-          <td><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version", '', false, $case->project), sprintf('%03d', $caseID));?></td>
+          <td><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version", '', false, '', true), sprintf('%03d', $caseID));?></td>
           <td><span class='<?php echo 'pri' . zget($lang->testcase->priList, $case->pri, $case->pri)?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
-          <td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version", '', false, $case->project), $case->title);?></td>
+          <td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', "testcaseID=$caseID&version=$case->version", '', false, '', true), $case->title);?></td>
           <td><?php echo $lang->testcase->typeList[$case->type];?></td>
           <td><?php echo zget($users, $case->openedBy);?></td>
           <td><?php echo zget($users, $case->lastRunner);?></td>
diff --git a/module/user/view/testtask.html.php b/module/user/view/testtask.html.php
index d81b0e4705..7313904b2f 100755
--- a/module/user/view/testtask.html.php
+++ b/module/user/view/testtask.html.php
@@ -39,8 +39,8 @@
       <tbody>
         <?php foreach($tasks as $task):?>
         <tr>
-          <td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id", '', false, $task->project), sprintf('%03d', $task->id));?></td>
-          <td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id", '', false, $task->project), $task->name);?></td>
+          <td><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id", '', false, '', true), sprintf('%03d', $task->id));?></td>
+          <td class='text-left nobr'><?php echo html::a($this->createLink('testtask', 'view', "taskID=$task->id", '', false, '', true), $task->name);?></td>
           <td class='nobr'><?php echo $task->executionName?></td>
           <td class='nobr'><?php $task->build == 'trunk' ? print($lang->trunk) : print(html::a($this->createLink('build', 'view', "buildID=$task->build", '', false, $task->project), $task->buildName));?></td>
           <td><?php echo $task->begin?></td>