* Fix bug of task #23123.

This commit is contained in:
liumengyi
2022-07-08 13:52:33 +08:00
parent 9921474711
commit f9b24fb48c
3 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -1813,7 +1813,7 @@ class bugModel extends model
* @access public
* @return array
*/
public function getExecutionBugs($executionID, $productID = 0, $branchID = 0, $build = 0, $type = '', $param = 0, $orderBy = 'id_desc', $excludeBugs = '', $pager = null)
public function getExecutionBugs($executionID, $productID = 0, $branchID = 'all', $build = 0, $type = '', $param = 0, $orderBy = 'id_desc', $excludeBugs = '', $pager = null)
{
$type = strtolower($type);
if($type == 'bysearch')
@@ -1846,7 +1846,7 @@ class bugModel extends model
$bugs = $this->dao->select('t1.*')->from(TABLE_BUG)->alias('t1')
->leftJoin(TABLE_MODULE)->alias('t2')->on('t1.module=t2.id')
->where('t1.deleted')->eq(0)
->andWhere('t1.branch')->eq($branchID)
->beginIF($branchID != 'all')->andWhere('t1.branch')->eq($branchID)->fi()
->beginIF(empty($build))->andWhere('t1.execution')->eq($executionID)->fi()
->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)->fi()
->beginIF($type == 'unresolved')->andWhere('t1.status')->eq('active')->fi()