Merge branch 'master' into 20.x

2020-08-26 16:10:36 +08:00
parent 0f7a173c85 b3f9379148
commit b72a7dee43
701 changed files with 33172 additions and 3307 deletions
@@ -340,7 +340,7 @@
                <?php if($bug->case):?>
                <tr>
                  <th class='w-60px'><?php echo $lang->bug->fromCase;?></th>
-                  <td><?php echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case", '', true), "#$bug->case $bug->caseTitle", '', "class='iframe' data-width='80%'");?></td>
+                  <td><?php echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case&caseVersion=" . ($bug->testtask ? "&from=testtask&taskID={$bug->testtask}" : ''), '', true), "#$bug->case $bug->caseTitle", '', "class='iframe' data-width='80%'");?></td>
                </tr>
                <?php endif;?>
                <?php if($bug->toCases):?>