* finish the task #560.

This commit is contained in:
shiyangyangwork@yahoo.cn
2011-10-26 02:17:49 +00:00
parent 21f64f78b4
commit f34f7d8e7b
4 changed files with 22 additions and 6 deletions
+1
View File
@@ -50,6 +50,7 @@ $lang->testtask->unlinkedCases = 'Unlinked cases';
$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->byModule = 'By module';
$lang->testtask->assignedToMe = 'Assgined to me';
+1
View File
@@ -50,6 +50,7 @@ $lang->testtask->unlinkedCases = '未关联用例列表';
$lang->testtask->linkedCases = '已关联用例列表';
$lang->testtask->confirmDelete = '您确认要删除该测试任务吗?';
$lang->testtask->passAll = '全部通过';
$lang->testtask->pass = '通过';
$lang->testtask->byModule = '按模块';
$lang->testtask->assignedToMe = '指派给我';
+11 -4
View File
@@ -219,11 +219,18 @@ class testtaskModel extends model
}
/* Create result of every step. */
foreach($this->post->steps as $stepID =>$stepResult)
if(isset($this->post->steps))
{
$step['result'] = $stepResult;
$step['real'] = $this->post->reals[$stepID];
$stepResults[$stepID] = $step;
foreach($this->post->steps as $stepID =>$stepResult)
{
$step['result'] = $stepResult;
$step['real'] = $this->post->reals[$stepID];
$stepResults[$stepID] = $step;
}
}
else
{
$stepResults = array();
}
/* Pares the extras */
+9 -2
View File
@@ -38,8 +38,15 @@
<tr class='a-center'>
<td colspan='5'>
<?php
echo html::submitButton();
echo html::submitButton($lang->testtask->passAll, "onclick=$('#passall').val(1)");
if(empty($run->case->steps))
{
echo html::submitButton($lang->testtask->pass, "onclick=$('#passall').val(1)");
}
else
{
echo html::submitButton();
echo html::submitButton($lang->testtask->passAll, "onclick=$('#passall').val(1)");
}
echo html::hidden('case', $run->case->id);
echo html::hidden('version', $run->case->version);
echo html::hidden('passall', 0);