From 1289533006f0af18064c2aca980f120d455ef478 Mon Sep 17 00:00:00 2001
From: jinianlan <jinianlan@qq.com>
Date: Thu, 1 Aug 2019 09:07:46 +0800
Subject: [PATCH] * fix Bug #2664

---
 module/testtask/control.php            | 2 +-
 module/testtask/model.php              | 4 +++-
 module/testtask/view/batchrun.html.php | 1 +
 module/testtask/view/runcase.html.php  | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index 28c2b795d6..6fc6b9447c 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -930,7 +930,6 @@ class testtask extends control
 
         $caseIDList = $this->post->caseIDList ? $this->post->caseIDList : die(js::locate($url, 'parent'));
         $caseIDList = array_unique($caseIDList);
-
         /* The case of tasks of qa. */
         if($productID)
         {
@@ -952,6 +951,7 @@ class testtask extends control
             ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case=t2.id')
             ->where('t2.id')->in($caseIDList)
             ->andWhere('t1.version=t2.version')
+            ->andWhere('t2.status')->ne('wait')
             ->fetchGroup('case', 'id');
 
         $this->view->caseIDList = $caseIDList;
diff --git a/module/testtask/model.php b/module/testtask/model.php
index dd1a16f5ec..a937a5cc83 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -992,6 +992,7 @@ class testtaskModel extends model
             ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
             ->where('t1.case')->in($caseIdList)
             ->andWhere('t1.version=t2.version')
+            ->andWhere('t2.status')->ne('wait')
             ->fetchGroup('case', 'id');
 
         $now = helper::now();
@@ -1157,7 +1158,7 @@ class testtaskModel extends model
         if($action == 'block')    return ($testtask->status == 'doing'   || $testtask->status == 'wait');
         if($action == 'activate') return ($testtask->status == 'blocked' || $testtask->status == 'done');
         if($action == 'close')    return $testtask->status != 'done';
-
+        if($action == 'runcase')  return $testtask->status != 'wait';
         return true;
     }
 
@@ -1390,4 +1391,5 @@ class testtaskModel extends model
         }
         return array($toList, $ccList);
     }
+
 }
diff --git a/module/testtask/view/batchrun.html.php b/module/testtask/view/batchrun.html.php
index 8a8c3abd24..6d4a76d03b 100644
--- a/module/testtask/view/batchrun.html.php
+++ b/module/testtask/view/batchrun.html.php
@@ -29,6 +29,7 @@
         </tr>
       </thead>
       <?php foreach($caseIDList as $caseID):?>
+      <?php if($cases[$caseID]->status == 'wait') continue;?>
       <?php if(!$productID) $moduleOptionMenu = $this->loadModel('tree')->getOptionMenu($cases[$caseID]->product, $viewType = 'case', $startModuleID = 0);?>
       <tr class='text-center'>
         <td><?php echo $caseID . html::hidden("version[$caseID]", $cases[$caseID]->version)?></td>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 69a131c422..72f16e2a34 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -84,7 +84,7 @@
         <td colspan='5' class='form-actions'>
           <?php
           if($preCase)  echo html::a(inlink('runCase', "runID={$preCase['runID']}&caseID={$preCase['caseID']}&version={$preCase['version']}"), $lang->testtask->pre, '', "id='pre' class='btn btn-wide'");
-          echo html::submitButton();
+          if($run->case->status != 'wait') echo html::submitButton();
           if($nextCase)  echo '&nbsp;' . html::a(inlink('runCase', "runID={$nextCase['runID']}&caseID={$nextCase['caseID']}&version={$nextCase['version']}"), $lang->testtask->next, '', "id='next' class='btn btn-wide'");
           echo html::hidden('case',    $run->case->id);
           echo html::hidden('version', $run->case->currentVersion);