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

* code for task #2896.

Browse Source
This commit is contained in:
wangyidong
2017-03-03 09:08:13 +08:00
parent 22115ecfbd
commit c162d18eb1
4 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/model.php
+1 -5
View File
@@ -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;
module/testsuite/control.php
+1 -5
View File
@@ -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;
module/testsuite/model.php
+1 -5
View File
@@ -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']);
module/testtask/control.php
+2 -10
View File
@@ -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;