diff --git a/module/testcase/model.php b/module/testcase/model.php index 43aec7ec88..e0c3290b1c 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -346,7 +346,7 @@ class testcaseModel extends model ->where('t1.project')->eq((int)$executionID) ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)->fi() ->beginIF(!empty($moduleID))->andWhere('t4.path')->like("%,$moduleID,%")->fi() - ->beginIF(!empty($productID))->andWhere('t2.branch')->eq($branchID)->fi() + ->beginIF(!empty($productID) and $branchID !== 'all')->andWhere('t2.branch')->eq($branchID)->fi() ->andWhere('t2.deleted')->eq('0') ->andWhere('t3.version > t2.storyVersion') ->andWhere("t3.status")->eq('active') @@ -362,7 +362,7 @@ class testcaseModel extends model ->beginIF($browseType != 'all' and $browseType != 'byModule')->andWhere('t2.status')->eq($browseType)->fi() ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)->fi() ->beginIF(!empty($moduleID))->andWhere('t3.path')->like("%,$moduleID,%")->fi() - ->beginIF(!empty($productID))->andWhere('t2.branch')->eq($branchID)->fi() + ->beginIF(!empty($productID) and $branchID !== 'all')->andWhere('t2.branch')->eq($branchID)->fi() ->andWhere('t2.deleted')->eq('0') ->orderBy($orderBy) ->page($pager)