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:
daitingting
2018-07-10 17:30:07 +08:00
parent 5b09738c95 0891061e34
commit a8f1f63101
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/js/create.js
+8
View File
@@ -50,6 +50,14 @@ $('#end').on('change', function()
$("input:radio[name='delta']").attr("checked", false);
});
$('form').submit(function()
{
$('#submit').click(function()
{
return false;
});
})
$('#future').on('change', function()
{
if($(this).prop('checked'))
module/testcase/control.php
+2 -2
View File
@@ -1112,7 +1112,7 @@ class testcase extends control
$case->stepExpect = '';
$case->real = '';
$result = isset($results[$case->id]) ? $results[$case->id] : array();
if($case->lastRunResult == 'fail' and !isset($relatedSteps[$case->id]) and !empty($result)) $case->real = $result[0]['real'];
$case->real = $result[0]['real'];
if(isset($relatedSteps[$case->id]))
{
$i = $childId = 0;
@@ -1133,7 +1133,7 @@ class testcase extends control
$sign = (in_array($this->post->fileType, array('html', 'xml'))) ? '<br />' : "\n";
$case->stepDesc .= $stepId . ". " . $step->desc . $sign;
$case->stepExpect .= $stepId . ". " . $step->expect . $sign;
if($case->lastRunResult == 'fail') $case->real .= $stepId . ". " . (isset($result[$step->id]) ? $result[$step->id]['real'] : '') . $sign;
$case->real .= $stepId . ". " . (isset($result[$step->id]) ? $result[$step->id]['real'] : '') . $sign;
$childId ++;
}
}