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

* finish task #2416.

Browse Source
This commit is contained in:
wangyidong
2015-11-26 13:11:01 +08:00
parent 6670b94caf
commit 48ada5974b
9 changed files with 156 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+17 -5
View File
@@ -567,6 +567,9 @@ class testtask extends control
$task = $this->testtask->getById($taskID);
$productID = $this->product->saveState($task->product, $this->products);
/* Save session. */
$this->testtask->setMenu($this->products, $productID, $task->branch);
/* Load pager. */
$this->app->loadClass('pager', $static = true);
$pager = pager::init($recTotal, $recPerPage, $pageID);
@@ -576,13 +579,20 @@ 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('linkcase', "taskID=$taskID");
unset($this->config->testcase->search['fields']['branch']);
unset($this->config->testcase->search['params']['branch']);
if($this->session->currentProductType == 'normal')
{
unset($this->config->testcase->search['fields']['branch']);
unset($this->config->testcase->search['params']['branch']);
}
else
{
$this->config->testcase->search['fields']['branch'] = $this->lang->product->branch;
$branches = array('' => '') + $this->loadModel('branch')->getPairs($task->product, 'noempty');
if($task->branch) $branches = array('' => '', $task->branch => $branches[$task->branch]);
$this->config->testcase->search['params']['branch']['values'] = $branches;
}
$this->loadModel('search')->setSearchParams($this->config->testcase->search);
/* Save session. */
$this->testtask->setMenu($this->products, $productID, $task->branch);
$this->view->title = $task->name . $this->lang->colon . $this->lang->testtask->linkCase;
$this->view->position[] = html::a($this->createLink('testtask', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->testtask->common;
@@ -612,6 +622,7 @@ class testtask extends control
$cases = $this->dao->select('*')->from(TABLE_CASE)->where($query)
->andWhere('product')->eq($productID)
->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
->beginIF($task->branch)->andWhere('branch')->in("0,$task->branch")->fi()
->andWhere('story')->in($stories)
->andWhere('deleted')->eq(0)
->orderBy('id desc')
@@ -628,6 +639,7 @@ class testtask extends control
$cases = empty($bugs) ? array() : $this->dao->select('*')->from(TABLE_CASE)->where($query)
->andWhere('product')->eq($productID)
->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
->beginIF($task->branch)->andWhere('branch')->in("0,$task->branch")->fi()
->andWhere('fromBug')->in($bugs)
->andWhere('deleted')->eq(0)
->orderBy('id desc')