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

* [task#126314] Fix bug on import case.

Browse Source
This commit is contained in:
liyang
2024-08-21 10:48:12 +08:00
committed by 曹延义
parent 6fa9283643
commit fec23075e3
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/model.php
+10 -1
View File
@@ -1561,10 +1561,19 @@ class testcaseModel extends model
}
unset($num);
unset($sign);
if($stepKey == 'expect' && !empty($stepData[$row]['desc']))
{
foreach($stepData[$row]['desc'] as $stepDescValue)
{
if(empty($stepDescValue['number'])) continue;
$caseNumber = $stepDescValue['number'];
if($stepDescValue && !isset($caseStep[$caseNumber]) || empty($caseStep[$caseNumber]['content'])) $caseStep[$caseNumber] = '';
}
}
$stepVars += count($caseStep, COUNT_RECURSIVE) - count($caseStep);
$stepData[$row][$stepKey] = $caseStep;
}
}
}
return $stepData;
module/testcase/zen.php
+13 -2
View File
@@ -2631,7 +2631,6 @@ class testcaseZen extends testcase
$fields = $this->testcase->getImportFields($productID);
$fields = array_flip($fields);
$endField = end($fields);
$caseData = array();
$stepData = array();
$stepVars = 0;
@@ -2654,9 +2653,21 @@ class testcaseZen extends testcase
$steps = (array)$cellValue;
if(strpos($cellValue, "\r")) $steps = explode("\r", $cellValue);
if(strpos($cellValue, "\n")) $steps = explode("\n", $cellValue);
$caseStep = $this->getImportSteps($field, $steps, $stepData, $row);
if($stepKey == 'expect' && !empty($stepData[$row]['desc']))
{
foreach($stepData[$row]['desc'] as $stepDescValue)
{
if(empty($stepDescValue['number'])) continue;
$caseNumber = $stepDescValue['number'];
if($stepDescValue && !isset($caseStep[$caseNumber]) || empty($caseStep[$caseNumber]['content'])) $caseStep[$caseNumber] = '';
}
}
$stepVars += count($caseStep, COUNT_RECURSIVE) - count($caseStep);
$stepData[$row][$stepKey] = array_values($caseStep);
}
}