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

Merge branch 'cyy_bug' into 'master'

Browse Source 
* Fix bug #29355.

See merge request easycorp/zentaopms!6059
This commit is contained in:
李玉春
2022-11-07 06:35:30 +00:00
parent 04794398fa dcdc7bd58a
commit 9030b0e194
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update17.7.sql
+2
View File
@@ -11,3 +11,5 @@ set
minColWidth = if(minColWidth < 200, 200, minColWidth),
maxColWidth = if(maxColWidth <= 200 and minColWidth <= 200, 201, maxColWidth)
where colWidth < 200 or minColWidth < 200 or maxColWidth < 200;
ALTER TABLE `zt_kanban` ADD `minColWidth` smallint(4) NOT NULL DEFAULT '200' AFTER `colWidth`;
ALTER TABLE `zt_project` ADD `minColWidth` smallint(4) NOT NULL DEFAULT '200' AFTER `colWidth`;
module/testtask/model.php
+5 -2
View File
@@ -1495,7 +1495,7 @@ class testtaskModel extends model
if($col->show)
{
$class = "c-$id ";
if($id == 'status') $class .= $run->status;
if($id == 'status') $class .= "{$run->status} status-testcase status-{$run->caseStatus}";
if($id == 'title') $class .= ' text-left';
if($id == 'id') $class .= ' cell-id';
if($id == 'lastRunResult') $class .= "result-testcase $run->lastRunResult";
@@ -1555,7 +1555,10 @@ class testtaskModel extends model
}
else
{
$status = $this->processStatus('testcase', $run);
$case = new stdClass();
$case->status = $run->caseStatus;
$status = $this->processStatus('testcase', $case);
if($run->status == $status) $status = $this->processStatus('testtask', $run);
echo $status;
}