From 6eadda51af63b259397a528913edf7aba8b6b21b Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 10 Jul 2018 15:59:35 +0800 Subject: [PATCH 1/2] *Finish task #4509. --- module/productplan/js/create.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/module/productplan/js/create.js b/module/productplan/js/create.js index 480f5822d2..db1aff6aca 100644 --- a/module/productplan/js/create.js +++ b/module/productplan/js/create.js @@ -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')) From 0891061e34eca67fcb844c130631e4902bbe29f4 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Tue, 10 Jul 2018 16:15:16 +0800 Subject: [PATCH 2/2] *Finish task #4630. --- module/testcase/control.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/testcase/control.php b/module/testcase/control.php index d336618f8c..fe2735701e 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -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'))) ? '
' : "\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 ++; } }