From 485e2c4d463610ac38123680776edb4c20b6fdec Mon Sep 17 00:00:00 2001
From: hufangzhou <746775970@qq.com>
Date: Thu, 29 Apr 2021 11:30:19 +0800
Subject: [PATCH] * Fix bug #12451.

---
 module/testcase/view/view.html.php |  2 +-
 module/testtask/model.php          |  2 +-
 module/upgrade/model.php           | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index e87fc1e0e0..35a40d8326 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -243,7 +243,7 @@
               <th><?php echo $lang->testcase->status;?></th>
               <td>
                 <?php
-                echo $this->processStatus($from != 'testtask' ? 'testcase' : 'testtask', $case);
+                echo $this->processStatus('testcase', $case);
                 if($case->version > $case->currentVersion and $from == 'testtask')
                 {
                     echo "(<span class='warning' title={$lang->testcase->fromTesttask}>{$lang->testcase->changed}</span> ";
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 6d95b453e0..46e77cb633 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -861,7 +861,7 @@ class testtaskModel extends model
             $row->case       = $caseID;
             $row->version    = $postData->versions[$caseID];
             $row->assignedTo = '';
-            $row->status     = 'wait';
+            $row->status     = 'normal';
             if($type == 'bybuild') $row->assignedTo = zget($assignedToPairs, $caseID, '');
             $this->dao->replace(TABLE_TESTRUN)->data($row)->exec();
 
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 5c8a6dbf4f..26879dcd0b 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -650,6 +650,7 @@ class upgradeModel extends model
         case '15_0_rc3':
             $this->saveLogs('Execute 15_0_rc3');
             $this->updateLibType();
+            $this->updateRunCaseStatus();
             $this->appendExec('15_0_rc3');
         }
 
@@ -4927,4 +4928,17 @@ class upgradeModel extends model
 
         return true;
     }
+
+    /**
+     * Update the testtask related cases status.
+     *
+     * @access public
+     * @return bool
+     */
+    public function updateRunCaseStatus()
+    {
+        $this->dao->update(TABLE_TESTRUN)->set('status')->eq('normal')->where('status')->in('wait,done')->exec();
+
+        return true;
+    }
 }