Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug testcase_importfromlib.

Browse Source
This commit is contained in:
songchenxuan
2021-11-29 14:30:50 +08:00
parent 92eabf46ab
commit 28eaf804d4
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+5 -1
View File
@@ -1716,6 +1716,9 @@ class testcase extends control
{
$browseType = strtolower($browseType);
$queryID = (int)$queryID;
$product = $this->loadModel('product')->getById($productID);
$branches = $this->loadModel('branch')->getPairs($productID, '', $projectID);
if($product->type != 'normal') $branches = array('0' => $this->lang->branch->main) + $branches;
if($_POST)
{
@@ -1756,6 +1759,7 @@ class testcase extends control
$this->view->libraries = $libraries;
$this->view->libID = $libID;
$this->view->product = $product;
$this->view->productID = $productID;
$this->view->branch = $branch;
$this->view->cases = $this->loadModel('testsuite')->getNotImportedCases($productID, $libID, $orderBy, $pager, $browseType, $queryID);
@@ -1763,7 +1767,7 @@ class testcase extends control
$this->view->libModules = $this->tree->getOptionMenu($libID, 'caselib');
$this->view->pager = $pager;
$this->view->orderBy = $orderBy;
$this->view->branches = array('0' => $this->lang->branch->main) + $this->loadModel('branch')->getPairs($productID, '', $projectID);
$this->view->branches = $branches;
$this->view->browseType = $browseType;
$this->view->queryID = $queryID;
module/testcase/view/importfromlib.html.php
+2 -2
View File
@@ -33,7 +33,7 @@
</div>
<?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
</th>
<?php if($branches):?>
<?php if($product->type != 'normal'):?>
<th class='c-branch'><?php echo $lang->testcase->branch ?></th>
<?php endif;?>
<th class='c-pri'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
@@ -54,7 +54,7 @@
</div>
<?php printf('%03d', $case->id);?>
</td>
<?php if($branches):?>
<?php if($product->type != 'normal'):?>
<td><?php echo html::select("branch[{$case->id}]", $branches, $branch, "class='form-control'")?></td>
<?php endif;?>
<td><span class='label-pri <?php echo 'label-pri-' . $case->pri;?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?>'><?php echo $case->pri == '0' ? '' : zget($lang->testcase->priList, $case->pri, $case->pri);?></span></td>