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

* testtaskModel: refactor the getLinkableCasesByBug method.

Browse Source
This commit is contained in:
liugang
2023-10-12 13:45:14 +08:00
parent 18f5dd6455
commit dd722a6e7b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/model.php
+6 -5
View File
@@ -433,19 +433,20 @@ class testtaskModel extends model
* @access public
* @return array
*/
public function getLinkableCasesByBug(int $productID, object $task, string $query, array $linkedCases, object $pager): array
public function getLinkableCasesByBug(int $productID, object $task, string $query = '', array $linkedCases = array(), object $pager = null): array
{
$bugs = $this->dao->select('bugs')->from(TABLE_BUILD)->where('id')->eq($task->build)->fetch('bugs');
if(!$bugs) return array();
return $this->dao->select('*')->from(TABLE_CASE)->where($query)
->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('project')->eq($this->session->project)->fi()
return $this->dao->select('*')->from(TABLE_CASE)
->where('deleted')->eq('0')
->andWhere('product')->eq($productID)
->andWhere('status')->ne('wait')
->andWhere('fromBug')->in(trim($bugs, ','))
->beginIF($query)->andWhere($query)->fi()
->beginIF($linkedCases)->andWhere('id')->notIN($linkedCases)->fi()
->beginIF($task->branch !== '')->andWhere('branch')->in("0,{$task->branch}")->fi()
->andWhere('fromBug')->in(trim($bugs, ','))
->andWhere('deleted')->eq('0')
->beginIF($this->lang->navGroup->testtask != 'qa')->andWhere('project')->eq($this->session->project)->fi()
->orderBy('id desc')
->page($pager)
->fetchAll();