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

Merge branch 'sprint/app10' into sprint/170

Browse Source
This commit is contained in:
王怡栋
2021-11-19 08:41:00 +08:00
parent 68d5d5e903 adc2aa1c9b
commit fde5cb61da
63 changed files with 2603 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+2 -2
View File
@@ -1347,7 +1347,7 @@ class testcase extends control
{
$cases = array();
$orderBy = " ORDER BY " . str_replace(array('|', '^A', '_'), ' ', $orderBy);
$stmt = $this->dbh->query($this->session->testcaseQueryCondition . $orderBy . ($this->post->limit ? ' LIMIT ' . $this->post->limit : ''));
$stmt = $this->dao->query($this->session->testcaseQueryCondition . $orderBy . ($this->post->limit ? ' LIMIT ' . $this->post->limit : ''));
while($row = $stmt->fetch())
{
$caseID = isset($row->case) ? $row->case : $row->id;
@@ -1408,7 +1408,7 @@ class testcase extends control
$result = isset($results[$case->id]) ? $results[$case->id] : array();
$case->real = '';
if(!empty($result))
if(!empty($result) and !isset($relatedSteps[$case->id]))
{
$firstStep = reset($result);
$case->real = $firstStep['real'];