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

Merge branch 'master_liuhong_25078' into 'master'

Browse Source 
*Fix bug #25078

See merge request easycorp/zentaopms!4762
This commit is contained in:
王怡栋
2022-08-04 02:01:25 +00:00
parent a194dd86ca 3c0471a280
commit eceac71915
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/testtask/model.php
View File

@@ -1451,7 +1451,13 @@ class testtaskModel extends model
if($action == 'activate') return ($testtask->status == 'blocked' || $testtask->status == 'done');
if($action == 'close') return $testtask->status != 'done';
if($action == 'runcase' and isset($testtask->auto) and $testtask->auto == 'unit') return false;
if($action == 'runcase') return isset($testtask->caseStatus) ? $testtask->caseStatus != 'wait' : $testtask->status != 'wait';
if($action == 'runcase')
{
if(isset($testtask->caseStatus)) return $testtask->version < $testtask->caseVersion ? $testtask->caseStatus == 'wait' : $testtask->caseStatus != 'wait';
return $testtask->status != 'wait';
}
return true;
}
@@ -1539,7 +1545,7 @@ class testtaskModel extends model
foreach(explode(',', trim($run->stage, ',')) as $stage) echo $this->lang->testcase->stageList[$stage] . '<br />';
break;
case 'status':
if($caseChanged)
if($run->caseStatus != 'wait' and $caseChanged)
{
echo "<span title='{$this->lang->testcase->changed}' class='warning'>{$this->lang->testcase->changed}</span>";
}
@@ -1604,7 +1610,7 @@ class testtaskModel extends model
echo $run->stepNumber;
break;
case 'actions':
if($caseChanged)
if($run->caseStatus != 'wait' and $caseChanged)
{
common::printIcon('testcase', 'confirmChange', "id=$run->case&taskID=$run->task&from=list", $run, 'list', 'search', 'hiddenwin');
break;