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

* Modify the style of bugSteps.

Browse Source
This commit is contained in:
liumengyi
2024-04-25 17:12:05 +08:00
committed by caoyanyi
parent 09734d6423
commit 242db8be70
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+5 -2
View File
@@ -1267,8 +1267,8 @@ class bugModel extends model
if(!isset($caseSteps[$stepId])) continue;
$step = $caseSteps[$stepId];
$stepDesc = '<p>' . str_replace("\n", '</p><p>', $step->desc) . '</p>';
$stepExpect = '<p>' . str_replace("\n", '</p><p>', $step->expect) . '</p>';
$stepDesc = str_replace("\n", '</p><p>', $step->desc);
$stepExpect = str_replace("\n", '</p><p>', $step->expect);
$stepResult = (!isset($stepResults[$stepId]) or empty($stepResults[$stepId]['real'])) ? '' : $stepResults[$stepId]['real'];
$bugStep .= '<p>' . $step->name . '. ' . $stepDesc . '</p>';
@@ -1278,8 +1278,11 @@ class bugModel extends model
}
$bugSteps = $run->case->precondition != '' ? "<p>[" . $this->lang->testcase->precondition . "]</p>" . "\n" . $run->case->precondition : '';
$bugSteps .= '<p></p>';
$bugSteps .= !empty($stepResults) && !empty($bugStep) ? str_replace(array('<br/>', '<p></p>'), '', $this->lang->bug->tplStep) . $bugStep : $this->lang->bug->tplStep;
$bugSteps .= '<p></p>';
$bugSteps .= !empty($stepResults) && !empty($bugResult) ? str_replace(array('<br/>', '<p></p>'), '', $this->lang->bug->tplResult) . $bugResult : $this->lang->bug->tplResult;
$bugSteps .= '<p></p>';
$bugSteps .= !empty($stepResults) && !empty($bugExpect) ? str_replace(array('<br/>', '<p></p>'), '', $this->lang->bug->tplExpect) . $bugExpect : $this->lang->bug->tplExpect;
if(!empty($run->task)) $testtask = $this->loadModel('testtask')->getByID($run->task);