* Finish task#46549

module/mr/model.php

@@ -1267,6 +1267,7 @@ class mrModel extends model
         return $this->dao->select("t2.id,t2.title")->from(TABLE_RELATION)->alias('t1')
             ->leftJoin(TABLE_MR)->alias('t2')->on('t1.AID = t2.id')
             ->where('t1.AType')->eq('mr')
+            ->andWhere('t1.BType')->eq($objectType)
             ->andWhere('t1.BID')->eq($objectID)
             ->fetchPairs();
     }

module/mr/view/link.html.php

@@ -168,7 +168,7 @@
                   <?php printf('%03d', $bug->id);?>
                 </td>
                 <td><span class='label-pri label-pri-<?php echo $bug->pri;?>' title='<?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?>'><?php echo zget($lang->bug->priList, $bug->pri, $bug->pri);?></span></td>
-                <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title, '', 'data-app="product"');?></td>
+                <td class='text-left nobr' title='<?php echo $bug->title?>'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
                 <td><?php echo zget($users, $bug->openedBy);?></td>
                 <td><?php echo zget($users, $bug->assignedTo);?></td>
                 <td>

module/story/control.php

@@ -1014,6 +1014,7 @@ class story extends control
         $bugs         = $this->dao->select('id,title')->from(TABLE_BUG)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll();
         $fromBug      = $this->dao->select('id,title')->from(TABLE_BUG)->where('toStory')->eq($storyID)->fetch();
         $cases        = $this->dao->select('id,title')->from(TABLE_CASE)->where('story')->eq($storyID)->andWhere('deleted')->eq(0)->fetchAll();
+        $linkedMRs    = $this->loadModel('mr')->getLinkedMRPairs($storyID, 'story');
         $modulePath   = $this->tree->getParents($story->module);
         $storyModule  = empty($story->module) ? '' : $this->tree->getById($story->module);
 
@@ -1054,6 +1055,7 @@ class story extends control
         $this->view->fromBug            = $fromBug;
         $this->view->cases              = $cases;
         $this->view->story              = $story;
+        $this->view->linkedMRs          = $linkedMRs;
         $this->view->track              = $this->story->getTrackByID($story->id);
         $this->view->users              = $this->user->getPairs('noletter');
         $this->view->reviewers          = $reviewers;

module/story/lang/en.php

@@ -163,6 +163,7 @@ $lang->story->field          = 'Sync Field';
 $lang->story->completeRate   = 'Completion Rate';
 $lang->story->reviewed       = 'Reviewed';
 $lang->story->toBeReviewed   = 'To Be Reviewed';
+$lang->story->linkMR         = 'Related MRs';
 
 $lang->story->ditto       = 'Ditto';
 $lang->story->dittoNotice = 'This story is not linked to the same product as the last one is!';

module/story/lang/zh-cn.php

@@ -163,6 +163,7 @@ $lang->story->field          = '同步的字段';
 $lang->story->completeRate   = '完成率';
 $lang->story->reviewed       = '已评审';
 $lang->story->toBeReviewed   = '待评审';
+$lang->story->linkMR         = '相关合并请求';
 
 $lang->story->ditto       = '同上';
 $lang->story->dittoNotice = "该{$lang->SRCommon}与上一{$lang->SRCommon}不属于同一产品！";

module/story/view/view.html.php

@@ -502,7 +502,7 @@
               <tbody>
                 <?php if(!empty($fromBug)):?>
                 <tr>
-                  <th class='thWidth'><?php echo $lang->story->legendFromBug;?></th>
+                  <th class='w-90px'><?php echo $lang->story->legendFromBug;?></th>
                   <td class='pd-0'>
                     <ul class='list-unstyled'>
                     <?php echo "<li title='#$fromBug->id $fromBug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id", '', true), "#$fromBug->id $fromBug->title", '', "class='iframe' data-width='80%'") . '</li>';?>
@@ -511,7 +511,7 @@
                 </tr>
                 <?php endif;?>
                 <tr>
-                  <th class='thWidth'><?php echo $lang->story->legendBugs;?></th>
+                  <th class='w-90px'><?php echo $lang->story->legendBugs;?></th>
                   <td class='pd-0'>
                     <ul class='list-unstyled'>
                     <?php
@@ -538,6 +538,27 @@
                     </ul>
                   </td>
                 </tr>
+                <tr>
+                  <th><?php echo $lang->story->linkMR;?></th>
+                  <td class='pd-0'>
+                    <ul class='list-unstyled'>
+                    <?php
+                    $mrPriv = common::hasPriv('mr', 'view');
+                    foreach($linkedMRs as $MRID => $linkMRTitle)
+                    {
+                        if($mrPriv)
+                        {
+                            echo "<li title='#$MRID $linkMRTitle'>" . html::a($this->createLink('mr', 'view', "MRID=$MRID"), "#$MRID $linkMRTitle") . '</li>';
+                        }
+                        else
+                        {
+                            echo "<li title='#$MRID $linkMRTitle'>" . "#$MRID $linkMRTitle" . '</li>';
+                        }
+                    }
+                    ?>
+                    </ul>
+                  </td>
+                </tr>
               </tbody>
             </table>
           </div>