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

* Fix bug #36204.

Browse Source
This commit is contained in:
hufangzhou
2023-07-11 13:46:18 +08:00
parent 6d480d2275
commit 82f5f0ec96
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+8 -1
View File
@@ -1865,7 +1865,7 @@ class docModel extends model
if(!$this->checkPrivDoc($doc)) unset($docs[$id]);
}
$bugIdList = $testReportIdList = $caseIdList = $storyIdList = $planIdList = $releaseIdList = $executionIdList = $taskIdList = $buildIdList = $issueIdList = $meetingIdList = $designIdList = $reviewIdList = 0;
$bugIdList = $testReportIdList = $caseIdList = $storyIdList = $planIdList = $releaseIdList = $executionIdList = $taskIdList = $buildIdList = $testtaskIdList = $issueIdList = $meetingIdList = $designIdList = $reviewIdList = 0;
$userView = $this->app->user->view->products;
if($type == 'project') $userView = $this->app->user->view->projects;
@@ -1917,6 +1917,9 @@ class docModel extends model
$buildPairs = $this->dao->select('id')->from(TABLE_BUILD)->where('execution')->in($executionIdList)->andWhere('deleted')->eq('0')->andWhere('execution')->in($this->app->user->view->sprints)->fetchPairs('id');
if(!empty($buildPairs)) $buildIdList = implode(',', $buildPairs);
$testtaskPairs = $this->dao->select('id')->from(TABLE_TESTTASK)->where('execution')->in($executionIdList)->andWhere('deleted')->eq('0')->andWhere('execution')->in($this->app->user->view->sprints)->fetchPairs('id');
if(!empty($testtaskPairs)) $testtaskIdList = implode(',', $testtaskPairs);
$executionIdList = $executionIdList ? join(',', $executionIdList) : 0;
$storyIDList = $storyIDList ? join(',', $storyIDList) : 0;
}
@@ -1932,6 +1935,9 @@ class docModel extends model
$buildPairs = $this->dao->select('id')->from(TABLE_BUILD)->where('execution')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('execution')->in($userView)->fetchPairs('id');
if(!empty($buildPairs)) $buildIdList = implode(',', $buildPairs);
$testtaskPairs = $this->dao->select('id')->from(TABLE_TESTTASK)->where('execution')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('execution')->in($userView)->fetchPairs('id');
if(!empty($testtaskPairs)) $testtaskIdList = implode(',', $testtaskPairs);
}
$files = $this->dao->select('*')->from(TABLE_FILE)->alias('t1')
@@ -1956,6 +1962,7 @@ class docModel extends model
->beginIF($type == 'project' or $type == 'execution')
->orWhere("(objectType = 'task' and objectID in ($taskIdList))")
->orWhere("(objectType = 'build' and objectID in ($buildIdList))")
->orWhere("(objectType = 'testtask' and objectID in ($testtaskIdList))")
->beginIF($storyIDList)->orWhere("((objectType = 'story' OR objectType = 'requirement') and objectID in ($storyIDList))")->fi()
->fi()
->markRight(1)