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

Merge branch 'liyuchun_64263' into 'zenops_41'

Browse Source 
* Finish task #64263.

See merge request easycorp/zentaopms!4958
This commit is contained in:
孙广明
2022-08-15 00:22:26 +00:00
parent 3ad35dd9d5 9bade59d7b
commit d7a8b587db
5 changed files with 71 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+3 -3
View File
@@ -630,7 +630,7 @@ class mr extends control
$this->loadModel('search')->setSearchParams($this->config->product->search);
$MR = $this->mr->getByID($MRID);
$relatedStories = $this->mr->getCommitedLink($MR->hostID, $MR->targetProject, $MR->mriid, 'story');
$relatedStories = $this->mr->getCommitedLink($MR, 'story');
$linkedStories = $this->mr->getLinkList($MRID, $product->id, 'story');
if($browseType == 'bySearch')
@@ -715,7 +715,7 @@ class mr extends control
$this->loadModel('search')->setSearchParams($this->config->bug->search);
$MR = $this->mr->getByID($MRID);
$relatedBugs = $this->mr->getCommitedLink($MR->hostID, $MR->targetProject, $MR->mriid, 'bug');
$relatedBugs = $this->mr->getCommitedLink($MR, 'bug');
$linkedBugs = $this->mr->getLinkList($MRID, $product->id, 'bug');
if($browseType == 'bySearch')
@@ -787,7 +787,7 @@ class mr extends control
$this->loadModel('search')->setSearchParams($this->config->execution->search);
$MR = $this->mr->getByID($MRID);
$relatedTasks = $this->mr->getCommitedLink($MR->hostID, $MR->targetProject, $MR->mriid, 'task');
$relatedTasks = $this->mr->getCommitedLink($MR, 'task');
$linkedTasks = $this->mr->getLinkList($MRID, $product->id, 'task');
/* Get executions by product. */