From be64430093f31472cccc7fd2daebbdfc2fd02414 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 15 Aug 2023 10:10:23 +0800 Subject: [PATCH] * testcaseModel: fix bug of display the cases with scenes as individual ones. --- module/testcase/model.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/testcase/model.php b/module/testcase/model.php index dc2934a414..4b8137fe9d 100644 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -273,6 +273,7 @@ class testcaseModel extends model ->beginIF($this->app->tab == 'project')->andWhere('t3.project')->eq($this->session->project)->fi() ->beginIF($branch !== 'all')->andWhere('t1.branch')->eq($branch)->fi() ->beginIF($moduleIdList)->andWhere('t1.module')->in($moduleIdList)->fi() + ->beginIF($browseType == 'all')->andWhere('t1.scene')->eq(0)->fi() ->beginIF($browseType == 'wait')->andWhere('t1.status')->eq($browseType)->fi() ->beginIF($auto == 'unit')->andWhere('t1.auto')->eq('unit')->fi() ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi() @@ -311,6 +312,7 @@ class testcaseModel extends model ->beginIF(!empty($productID))->andWhere('t2.product')->eq((int)$productID)->fi() ->beginIF(!empty($productID) and $branch !== 'all')->andWhere('t2.branch')->eq($branch)->fi() ->beginIF($moduleIdList)->andWhere('t2.module')->in($moduleIdList)->fi() + ->beginIF($browseType == 'all')->andWhere('t2.scene')->eq(0)->fi() ->beginIF($browseType == 'wait')->andWhere('t2.status')->eq($browseType)->fi() ->beginIF($auto == 'unit')->andWhere('t2.auto')->eq('unit')->fi() ->beginIF($auto != 'unit')->andWhere('t2.auto')->ne('unit')->fi()