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

* Fix bug#13973.

Browse Source
This commit is contained in:
qiyu-xie
2021-08-04 10:01:56 +08:00
parent 446cb5969c
commit 600fd53131
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+5 -1
View File
@@ -1267,7 +1267,8 @@ class docModel extends model
$testReportPairs = $this->dao->select('id')->from(TABLE_TESTREPORT)->where($type)->eq($objectID)->andWhere('deleted')->eq('0')->andWhere($type)->in($userView)->fetchPairs('id');
if(!empty($testReportPairs)) $testReportIdList = implode(',', $testReportPairs);
$casePairs = $this->dao->select('id')->from(TABLE_CASE)->where($type)->eq($objectID)->andWhere('deleted')->eq('0')->andWhere($type)->in($userView)->fetchPairs('id');
$field = $type == 'execution' ? 'project' : $type;
$casePairs = $this->dao->select('`case`')->from(TABLE_PROJECTCASE)->where($field)->eq($objectID)->andWhere($field)->in($userView)->fetchPairs('case');
if(!empty($casePairs)) $caseIdList = implode(',', $casePairs);
$idList = array_keys($docs);
@@ -1280,6 +1281,9 @@ class docModel extends model
$releasePairs = $this->dao->select('id')->from(TABLE_RELEASE)->where('product')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('product')->in($userView)->fetchPairs('id');
if(!empty($releasePairs)) $releaseIdList = implode(',', $releasePairs);
$casePairs = $this->dao->select('id')->from(TABLE_CASE)->where($type)->eq($objectID)->andWhere('deleted')->eq('0')->andWhere($type)->in($userView)->fetchPairs('id');
if(!empty($casePairs)) $caseIdList = implode(',', $casePairs);
}
elseif($type == 'project')
{
module/testcase/model.php
-1
View File
@@ -48,7 +48,6 @@ class testcaseModel extends model
->setDefault('openedBy', $this->app->user->account)
->setDefault('openedDate', $now)
->setIF($this->config->systemMode == 'new' and $this->app->openApp == 'project', 'project', $this->session->project)
->setIF($this->config->systemMode == 'new' and $this->app->openApp == 'execution', 'execution', $this->session->execution)
->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion((int)$this->post->story))
->remove('steps,expects,files,labels,stepType,forceNotReview')
->setDefault('story', 0)