From 49ff270d97a80038d5cbd92a355d952e921d7e02 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Wed, 3 Aug 2022 06:53:36 +0000
Subject: [PATCH 1/3] *Fix bug #25078

---
 module/testtask/model.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/testtask/model.php b/module/testtask/model.php
index 0e9a9dbb14..0fbd6adbc8 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1445,7 +1445,7 @@ 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') return isset($testtask->caseStatus) ? ($testtask->version < $testtask->caseVersion ? $testtask->caseStatus == 'wait' : $testtask->caseStatus != 'wait') : $testtask->status != 'wait';
         return true;
     }
 
@@ -1533,7 +1533,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>";
                 }
@@ -1598,7 +1598,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;

From 892cb2e6dcd66e81c794f90b235d9d72ae92ab02 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Thu, 4 Aug 2022 00:18:17 +0000
Subject: [PATCH 2/3] *Fix bug #25078

---
 module/testtask/model.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/module/testtask/model.php b/module/testtask/model.php
index 0fbd6adbc8..e866082633 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1445,7 +1445,11 @@ 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->version < $testtask->caseVersion ? $testtask->caseStatus == 'wait' : $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;
     }
 

From 3c0471a28043de49e332829e2fcd825385c1f224 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Thu, 4 Aug 2022 01:28:19 +0000
Subject: [PATCH 3/3] *Fix bug #25078*Fix bug #25078*Fix bug #25078*Fix bug
 #25078*Fix bug

---
 module/testtask/model.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/module/testtask/model.php b/module/testtask/model.php
index e866082633..379764fc17 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1445,11 +1445,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'){
-            if(isset($testtask->caseStatus))
-                return ($testtask->version < $testtask->caseVersion) ? $testtask->caseStatus == 'wait' : $testtask->caseStatus != '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;
     }