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

* Fix testreport unit test script bug.

Browse Source
This commit is contained in:
wangyuting
2023-12-22 14:49:05 +08:00
parent 4bfded2301
commit b93e11a7d0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testreport/model.php
+2 -2
View File
@@ -311,8 +311,8 @@ class testreportModel extends model
->andWhere('openedDate')->lt("{$begin} 23:59:59")
->beginIF(is_array($builds) && $type == 'build')->andWhere('id')->in($bugIdList)->fi()
->beginIF(!is_array($builds) && $type == 'build')->andWhere("(resolvedBuild = 'trunk' and resolvedDate >= '{$begin}' and resolvedDate <= '{$end} 23:59:59')")->fi()
->beginIF($type == 'project')->andWhere("(id " . helper::dbIN($bugIdList) . " OR (resolvedBuild = 'trunk' and resolvedDate >= '{$begin}' and resolvedDate <= '{$end} 23:59:59'))")
->beginIF($type == 'execution')->andWhere("(id " . helper::dbIN($bugIdList) . " OR (resolvedBuild = 'trunk' and resolvedDate >= '{$begin}' and resolvedDate <= '{$end} 23:59:59'))")
->beginIF($type == 'project')->andWhere("(id " . helper::dbIN($bugIdList) . " OR (resolvedBuild = 'trunk' and resolvedDate >= '{$begin}' and resolvedDate <= '{$end} 23:59:59'))")->fi()
->beginIF($type == 'execution')->andWhere("(id " . helper::dbIN($bugIdList) . " OR (resolvedBuild = 'trunk' and resolvedDate >= '{$begin}' and resolvedDate <= '{$end} 23:59:59'))")->fi()
->fetchAll('id');
}
module/testreport/test/testreport.class.php
+1 -1
View File
@@ -233,7 +233,7 @@ class testreportTest
if(dao::isError()) return dao::getError();
return implode(',', array_keys($objects));
return $objects ? implode(',', array_keys($objects)) : '';
}
/**