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

* Adjust mr linked bug resolved version.

Browse Source
This commit is contained in:
caoyanyi
2023-11-22 08:55:51 +08:00
parent dd7efc5cc3
commit e4702d2b11
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+2
View File
@@ -693,6 +693,7 @@ class mr extends control
$stories = $this->mr->getLinkList($MRID, $product->id, 'story', $type == 'story' ? $orderBy : '', $storyPager);
$bugs = $this->mr->getLinkList($MRID, $product->id, 'bug', $type == 'bug' ? $orderBy : '', $bugPager);
$tasks = $this->mr->getLinkList($MRID, $product->id, 'task', $type == 'task' ? $orderBy : '', $taskPager);
$builds = $this->loadModel('build')->getBuildPairs($product->id);
$this->view->title = $this->lang->mr->common . $this->lang->colon . $this->lang->mr->link;
$this->view->MR = $MR;
@@ -708,6 +709,7 @@ class mr extends control
$this->view->bugPager = $bugPager;
$this->view->taskPager = $taskPager;
$this->view->type = $type;
$this->view->builds = $builds;
$this->view->orderBy = $orderBy;
$this->view->link = $link;
$this->view->param = $param;
module/mr/ui/link.html.php
+1
View File
@@ -45,6 +45,7 @@ $storyCols['actions']['list']['unlink']['url'] = $this->createLink('mr'
$stories = initTableData($stories, $storyCols);
$bugCols = $config->release->dtable->bug->fieldList;
$bugCols['resolvedBuild']['map'] = $builds;
$bugCols['actions'] = $actionMenu;
$bugCols['actions']['list']['unlink']['data-confirm'] = $lang->productplan->confirmUnlinkBug;
$bugCols['actions']['list']['unlink']['url'] = $this->createLink('mr', 'unlink', "MRID=$MR->id&productID=$product->id&type=bug&linkID={id}&confirm=yes");