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

Merge branch release/21.7.3 of zentao/zentaopms (#10432)

Browse Source
This commit is contained in:
刘刚
2025-07-17 16:16:56 +08:00
committed by Gitfox
parent 3602a6598f e21db62811
commit 03915362e4
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+1 -1
View File
@@ -210,7 +210,7 @@ class testcase extends control
*/
public function groupCase(int $productID = 0, string $branch = '', string $groupBy = 'story', int $objectID = 0, string $caseType = '', string $browseType = 'all')
{
if($browseType) $this->session->set('caseBrowseType', $browseType, $this->app->tab);
if($browseType) $this->session->set('caseBrowseType', $browseType);
$this->testcaseZen->checkProducts(); // 如果不存在产品，则跳转到产品创建页面。
/* 设置SESSION和COOKIE，获取产品信息。 */
module/testcase/model.php
+1
View File
@@ -108,6 +108,7 @@ class testcaseModel extends model
->beginIF($branch !== 'all')->andWhere('t1.branch')->eq($branch)->fi()
->beginIF($moduleIdList)->andWhere('t1.module')->in($moduleIdList)->fi()
->beginIF($browseType == 'wait')->andWhere('t1.status')->eq($browseType)->fi()
->beginIF($browseType == 'needconfirm')->andWhere('t2.version > t1.version')->fi()
->beginIF($auto == 'auto' || $auto == 'unit')->andWhere('t1.auto')->eq($auto)->fi()
->beginIF($auto != 'auto' && $auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
->beginIF($caseType)->andWhere('t1.type')->eq($caseType)->fi()