* add fail function for task #560.

This commit is contained in:
shiyangyangwork@yahoo.cn
2011-10-28 05:51:57 +00:00
parent b3a82ed8f9
commit 18333bfd1b
4 changed files with 14 additions and 4 deletions
+1
View File
@@ -51,6 +51,7 @@ $lang->testtask->linkedCases = 'Linked cases';
$lang->testtask->confirmDelete = 'Are you sure to delete this test task?';
$lang->testtask->passAll = 'Pass all';
$lang->testtask->pass = 'Pass';
$lang->testtask->fail = 'Fail';
$lang->testtask->byModule = 'By module';
$lang->testtask->assignedToMe = 'Assgined to me';
+1
View File
@@ -51,6 +51,7 @@ $lang->testtask->linkedCases = '已关联用例列表';
$lang->testtask->confirmDelete = '您确认要删除该测试任务吗?';
$lang->testtask->passAll = '全部通过';
$lang->testtask->pass = '通过';
$lang->testtask->fail = '失败';
$lang->testtask->byModule = '按模块';
$lang->testtask->assignedToMe = '指派给我';
+11 -4
View File
@@ -208,14 +208,21 @@ class testtaskModel extends model
$caseResult = 'pass';
if(!$this->post->passall)
{
foreach($this->post->steps as $stepID => $stepResult)
if(isset($this->post->steps))
{
if($stepResult != 'pass' and $stepResult != 'n/a')
foreach($this->post->steps as $stepID => $stepResult)
{
$caseResult = $stepResult;
break;
if($stepResult != 'pass' and $stepResult != 'n/a')
{
$caseResult = $stepResult;
break;
}
}
}
else
{
$caseResult = 'fail';
}
}
/* Create result of every step. */
+1
View File
@@ -40,6 +40,7 @@
if(empty($run->case->steps))
{
echo html::submitButton($lang->testtask->pass, "onclick=$('#passall').val(1)");
echo html::submitButton($lang->testtask->fail, "onclick=$('#passall').val(0)");
}
else
{