From c162d18eb1156c3acff1a429105dcf59b5ad2b0f Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 3 Mar 2017 09:08:13 +0800
Subject: [PATCH]  * code for task #2896.

---
 module/testcase/model.php    |  6 +-----
 module/testsuite/control.php |  6 +-----
 module/testsuite/model.php   |  6 +-----
 module/testtask/control.php  | 12 ++----------
 4 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/module/testcase/model.php b/module/testcase/model.php
index 64ffc87887..1c022837fd 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -1113,11 +1113,7 @@ class testcaseModel extends model
             $this->config->testcase->search['fields']['branch'] = $this->lang->product->branch;
             $this->config->testcase->search['params']['branch']['values'] = array('' => '') + $this->loadModel('branch')->getPairs($productID, 'noempty') + array('all' => $this->lang->branch->all);
         }
-        if(!$this->config->testcase->needReview)
-        {
-            unset($this->lang->testcase->statusList['wait']);
-            $this->config->testcase->search['params']['status']['values'] = $this->lang->testcase->statusList;
-        }
+        if(!$this->config->testcase->needReview) unset($this->config->testcase->search['params']['status']['values']['wait']);
         $this->config->testcase->search['actionURL'] = $actionURL;
         $this->config->testcase->search['queryID']   = $queryID;
 
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 6b6f002d04..d86528816a 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -288,11 +288,7 @@ class testsuite extends control
             $branches = array('' => '') + $this->loadModel('branch')->getPairs($suite->product, 'noempty');
             $this->config->testcase->search['params']['branch']['values'] = $branches;
         }
-        if(!$this->config->testcase->needReview)
-        {
-            unset($this->lang->testcase->statusList['wait']);
-            $this->config->testcase->search['params']['status']['values'] = $this->lang->testcase->statusList;
-        }
+        if(!$this->config->testcase->needReview) unset($this->config->testcase->search['params']['status']['values']['wait']);
         $this->loadModel('search')->setSearchParams($this->config->testcase->search);
 
         $this->view->title      = $suite->name . $this->lang->colon . $this->lang->testsuite->linkCase;
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index b28f861521..9860954c70 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -456,11 +456,7 @@ class testsuiteModel extends model
         $this->config->testcase->search['params']['lib']['operator']  = '=';
         $this->config->testcase->search['params']['lib']['control']   = 'select';
         $this->config->testcase->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($libID, $viewType = 'testlib');
-        if(!$this->config->testcase->needReview)
-        {
-            unset($this->lang->testcase->statusList['wait']);
-            $this->config->testcase->search['params']['status']['values'] = $this->lang->testcase->statusList;
-        }
+        if(!$this->config->testcase->needReview) unset($this->config->testcase->search['params']['status']['values']['wait']);
         unset($this->config->testcase->search['fields']['product']);
         unset($this->config->testcase->search['params']['product']);
         unset($this->config->testcase->search['fields']['branch']);
diff --git a/module/testtask/control.php b/module/testtask/control.php
index ce4789e7ba..ebf91e1f3a 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -261,11 +261,7 @@ class testtask extends control
         $this->config->testcase->search['params']['product']['values'] = array($productID => $this->products[$productID], 'all' => $this->lang->testcase->allProduct);
         $this->config->testcase->search['params']['module']['values']  = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'case');
         $this->config->testcase->search['actionURL'] = inlink('cases', "taskID=$taskID&browseType=bySearch&queryID=myQueryID");
-        if(!$this->config->testcase->needReview)
-        {
-            unset($this->lang->testcase->statusList['wait']);
-            $this->config->testcase->search['params']['status']['values'] = $this->lang->testcase->statusList;
-        }
+        if(!$this->config->testcase->needReview) unset($this->config->testcase->search['params']['status']['values']['wait']);
         unset($this->config->testcase->search['fields']['branch']);
         unset($this->config->testcase->search['params']['branch']);
         $this->loadModel('search')->setSearchParams($this->config->testcase->search);
@@ -569,11 +565,7 @@ class testtask extends control
             if($task->branch) $branches = array('' => '', $task->branch => $branches[$task->branch]);
             $this->config->testcase->search['params']['branch']['values'] = $branches;
         }
-        if(!$this->config->testcase->needReview)
-        {
-            unset($this->lang->testcase->statusList['wait']);
-            $this->config->testcase->search['params']['status']['values'] = $this->lang->testcase->statusList;
-        }
+        if(!$this->config->testcase->needReview) unset($this->config->testcase->search['params']['status']['values']['wait']);
         $this->loadModel('search')->setSearchParams($this->config->testcase->search);
 
         $this->view->title      = $task->name . $this->lang->colon . $this->lang->testtask->linkCase;