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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
Catouse
2017-03-02 10:32:14 +08:00
parent 47405cf9dc 9042d65433
commit 97739b476c
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/lang/zh-cn.php
+4 -3
View File
@@ -54,9 +54,10 @@ $lang->testcase->stepNumberAB = 'S';
$lang->testcase->createBug = '转Bug';
$lang->case = $lang->testcase; // 用于DAO检查时使用。因为case是系统关键字，所以无法定义该模块为case，只能使用testcase，但表还是使用的case。
$lang->testcase->stepID = '编号';
$lang->testcase->stepDesc = '步骤';
$lang->testcase->stepExpect = '预期';
$lang->testcase->stepID = '编号';
$lang->testcase->stepDesc = '步骤';
$lang->testcase->stepExpect = '预期';
$lang->testcase->stepVersion = '版本';
$lang->testcase->common = '用例';
$lang->testcase->index = "用例管理首页";
module/testcase/view/browsedata.html.php
+1 -1
View File
@@ -78,7 +78,7 @@
<td class='text-right'>
<?php
common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", '', 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");
common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', 'list-alt', '', 'results iframe');
common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", '', 'list', 'list-alt', '', 'results iframe', false, "data-width='95%'");
common::printIcon('testcase', 'edit', "caseID=$case->id", $case, 'list');
common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", $case, 'list', 'copy');
module/testtask/view/results.html.php
+6 -4
View File
@@ -53,11 +53,12 @@
<thead>
<tr>
<th class='w-40px'><?php echo $lang->testcase->stepID;?></th>
<th class='w-p30'><?php echo $lang->testcase->stepDesc;?></th>
<th class='w-p25'><?php echo $lang->testcase->stepExpect;?></th>
<th class='w-p30 text-left'><?php echo $lang->testcase->stepDesc;?></th>
<th class='w-p25 text-left'><?php echo $lang->testcase->stepExpect;?></th>
<th class='w-p10 text-left'><?php echo $lang->testcase->stepVersion;?></th>
<th class='text-center'><?php echo $lang->testcase->result;?></th>
<th class='w-p20'><?php echo $lang->testcase->real;?></th>
<th class='w-60px'></th>
<th class='w-p20 text-left'><?php echo $lang->testcase->real;?></th>
<th class='w-50px'></th>
</tr>
</thead>
<?php
@@ -72,6 +73,7 @@
<td class='w-30px text-center'><?php echo $i;?></td>
<td><?php if(isset($stepResult['desc'])) echo nl2br($stepResult['desc']);?></td>
<td><?php if(isset($stepResult['expect'])) echo nl2br($stepResult['expect']);?></td>
<td><?php if(isset($result->version)) echo nl2br($result->version);?></td>
<?php if(!empty($stepResult['result'])):?>
<td class='<?php echo $stepResult['result'];?> text-center'><?php echo $lang->testcase->resultList[$stepResult['result']];?></td>
<td><?php echo $stepResult['real'];?></td>