diff --git a/db/update17.7.sql b/db/update17.7.sql index 9f427d96c8..c091527cdf 100644 --- a/db/update17.7.sql +++ b/db/update17.7.sql @@ -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`; diff --git a/module/testtask/model.php b/module/testtask/model.php index a77f443a58..b036c2b5c4 100755 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -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; }