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

Merge branch 'zentaopms_281'

Browse Source
This commit is contained in:
Yagami
2023-02-08 15:31:13 +08:00
parent 5611c2c285 bc593460d0
commit c2724b9f57
31 changed files with 157 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+11 -9
View File
@@ -399,18 +399,20 @@ class testtaskModel extends model
{
$stories = $this->dao->select('stories')->from(TABLE_BUILD)->where('id')->eq($task->build)->fetch('stories');
$cases = array();
$query = preg_replace('/`(\w+)`/', 't1.`$1`', $query);
if($stories)
{
$cases = $this->dao->select('*')->from(TABLE_CASE)
$cases = $this->dao->select('t1.*,t2.title as storyTitle')->from(TABLE_CASE)->alias('t1')
->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
->where($query)
->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('project')->eq($this->session->project)->fi()
->andWhere('product')->eq($productID)
->andWhere('status')->ne('wait')
->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
->beginIF($task->branch !== '')->andWhere('branch')->in("0,$task->branch")->fi()
->andWhere('story')->in(trim($stories, ','))
->andWhere('deleted')->eq(0)
->orderBy('id desc')
->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi()
->andWhere('t1.product')->eq($productID)
->andWhere('t1.status')->ne('wait')
->beginIF($linkedCases)->andWhere('t1.id')->notIN($linkedCases)->fi()
->beginIF($task->branch !== '')->andWhere('t1.branch')->in("0,$task->branch")->fi()
->andWhere('t1.story')->in(trim($stories, ','))
->andWhere('t1.deleted')->eq(0)
->orderBy('t1.id desc')
->page($pager)
->fetchAll();
}