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

* Fix bug #20112.

Browse Source
This commit is contained in:
zhouxudong
2022-03-18 11:57:22 +08:00
parent 4d2981ca84
commit 995c88a678
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+1
View File
@@ -263,6 +263,7 @@ class testcase extends control
{
if($groupBy == 'story')
{
if($case->storyDeleted) continue;
$groupCases[$case->story][] = $case;
$groupByList[$case->story] = $case->storyTitle;
}
module/testcase/model.php
+1 -1
View File
@@ -231,7 +231,7 @@ class testcaseModel extends model
*/
public function getModuleCases($productID, $branch = 0, $moduleIdList = 0, $orderBy = 'id_desc', $pager = null, $browseType = '', $auto = 'no')
{
$stmt = $this->dao->select('t1.*, t2.title as storyTitle')->from(TABLE_CASE)->alias('t1')
$stmt = $this->dao->select('t1.*, t2.title as storyTitle, t2.deleted as storyDeleted')->from(TABLE_CASE)->alias('t1')
->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id');
if($this->app->tab == 'project') $stmt = $stmt->leftJoin(TABLE_PROJECTCASE)->alias('t3')->on('t1.id=t3.case');
module/testtask/control.php
+1 -1
View File
@@ -678,7 +678,7 @@ class testtask extends control
if($groupBy == 'story' && $task->build)
{
$buildStoryIdList = $this->dao->select('stories')->from(TABLE_BUILD)->where('id')->eq($task->build)->fetch('stories');
$buildStories = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($buildStoryIdList)->andWhere('id')->notin(array_keys($groupCases))->fetchAll('id');
$buildStories = $this->dao->select('id,title')->from(TABLE_STORY)->where('id')->in($buildStoryIdList)->andWhere('deleted')->eq(0)->andWhere('id')->notin(array_keys($groupCases))->fetchAll('id');
foreach($buildStories as $buildStory)
{
$groupCases[$buildStory->id][] = $buildStory;