From e4702d2b116dd6f4b22024f9514c8a2b40397e43 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 22 Nov 2023 08:55:48 +0800
Subject: [PATCH] * Adjust mr linked bug resolved version.

---
 module/mr/control.php      | 2 ++
 module/mr/ui/link.html.php | 1 +
 2 files changed, 3 insertions(+)

diff --git a/module/mr/control.php b/module/mr/control.php
index b79a9a0b61..c2fb114187 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -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;
diff --git a/module/mr/ui/link.html.php b/module/mr/ui/link.html.php
index 18a8923ce0..bd9aee9cfb 100644
--- a/module/mr/ui/link.html.php
+++ b/module/mr/ui/link.html.php
@@ -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");