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

* fix bug #553.

Browse Source
This commit is contained in:
wangyidong
2014-07-29 02:08:17 +00:00
parent f249c8674d
commit bb0787f200
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+24 -17
View File
@@ -574,27 +574,34 @@ class testtask extends control
if($param == 'bystory')
{
$stories = $this->dao->select('stories')->from(TABLE_BUILD)->where('id')->eq($task->build)->fetch('stories');
$cases = $this->dao->select('*')->from(TABLE_CASE)->where($query)
->andWhere('product')->eq($productID)
->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
->andWhere('story')->in($stories)
->andWhere('deleted')->eq(0)
->orderBy('id desc')
->page($pager)
->fetchAll();
$cases = array();
if($stories)
{
$cases = $this->dao->select('*')->from(TABLE_CASE)->where($query)
->andWhere('product')->eq($productID)
->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
->andWhere('story')->in($stories)
->andWhere('deleted')->eq(0)
->orderBy('id desc')
->page($pager)
->fetchAll();
}
}
if($param == 'bybug')
{
$bugs = $this->dao->select('bugs')->from(TABLE_BUILD)->where('id')->eq($task->build)->fetch('bugs');
$cases = $this->dao->select('*')->from(TABLE_CASE)->where($query)
->andWhere('product')->eq($productID)
->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
->andWhere('fromBug')->in($bugs)
->andWhere('deleted')->eq(0)
->orderBy('id desc')
->page($pager)
->fetchAll();
$cases = array();
if($bugs)
{
$cases = empty($bugs) ? array() : $this->dao->select('*')->from(TABLE_CASE)->where($query)
->andWhere('product')->eq($productID)
->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
->andWhere('fromBug')->in($bugs)
->andWhere('deleted')->eq(0)
->orderBy('id desc')
->page($pager)
->fetchAll();
}
}
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->cases = $cases;