From 0b965aa6998f99ed8e8b91fdd9e360770616ff81 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 26 Nov 2021 07:17:55 +0000
Subject: [PATCH] * Fix bug#16745

---
 module/group/lang/resource.php | 24 ++++++++++++++++++------
 module/mr/lang/en.php          |  8 +++++++-
 module/mr/lang/zh-cn.php       |  6 ++++++
 module/mr/view/link.html.php   | 10 +++++-----
 4 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 88f24577ce..f61b0e494f 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1187,12 +1187,18 @@ $lang->gitlab->methodOrder[110] = 'webhook';
 
 /* merge request. */
 $lang->resource->mr = new stdclass();
-$lang->resource->mr->create   = 'create';
-$lang->resource->mr->browse   = 'browse';
-$lang->resource->mr->edit     = 'edit';
-$lang->resource->mr->delete   = 'delete';
-$lang->resource->mr->view     = 'view';
-$lang->resource->mr->accept   = 'accept';
+$lang->resource->mr->create    = 'create';
+$lang->resource->mr->browse    = 'browse';
+$lang->resource->mr->edit      = 'edit';
+$lang->resource->mr->delete    = 'delete';
+$lang->resource->mr->view      = 'view';
+$lang->resource->mr->accept    = 'accept';
+$lang->resource->mr->diff      = 'viewDiff';
+$lang->resource->mr->link      = 'linkList';
+$lang->resource->mr->linkStory = 'linkStory';
+$lang->resource->mr->linkBug   = 'linkBug';
+$lang->resource->mr->linkTask  = 'linkTask';
+$lang->resource->mr->unlink    = 'unlink';
 
 $lang->mr->methodOrder[10] = 'create';
 $lang->mr->methodOrder[15] = 'browse';
@@ -1200,6 +1206,12 @@ $lang->mr->methodOrder[20] = 'edit';
 $lang->mr->methodOrder[25] = 'delete';
 $lang->mr->methodOrder[35] = 'view';
 $lang->mr->methodOrder[45] = 'accept';
+$lang->mr->methodOrder[50] = 'diff';
+$lang->mr->methodOrder[55] = 'link';
+$lang->mr->methodOrder[60] = 'linkStory';
+$lang->mr->methodOrder[65] = 'linkBug';
+$lang->mr->methodOrder[70] = 'linkTask';
+$lang->mr->methodOrder[75] = 'unlink';
 
 /* Git. */
 $lang->resource->git = new stdclass();
diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php
index 461001a797..d8f5aef3d3 100644
--- a/module/mr/lang/en.php
+++ b/module/mr/lang/en.php
@@ -13,9 +13,15 @@ $lang->mr->source       = 'source';
 $lang->mr->target       = 'target';
 $lang->mr->viewDiff     = 'View diff';
 $lang->mr->viewInGitlab = 'View in GitLab';
-$lang->mr->link         = 'Link stories,bugs,tasks';
+$lang->mr->link         = 'Link of stories,bugs,tasks';
 $lang->mr->createAction = '%s, <strong>%s</strong> submitted a <a href="%s">Merge Request</a>.';
 
+$lang->mr->linkList  = 'Link List of stories,bugs,tasks';
+$lang->mr->linkStory = 'Link Stories';
+$lang->mr->linkBug   = 'Link Bugs';
+$lang->mr->linkTask  = 'Link Tasks';
+$lang->mr->unlink    = 'UnLink of stories,bugs,tasks';
+
 $lang->mr->id          = 'ID';
 $lang->mr->mriid       = "raw MR ID";
 $lang->mr->title        = 'Name';
diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php
index 55ea5ba1f9..63b2f93caa 100644
--- a/module/mr/lang/zh-cn.php
+++ b/module/mr/lang/zh-cn.php
@@ -16,6 +16,12 @@ $lang->mr->viewInGitlab = '在GitLab查看';
 $lang->mr->link         = '关联需求、bug、任务';
 $lang->mr->createAction = '%s, 由 <strong>%s</strong> 提交了 <a href="%s">合并请求</a>。';
 
+$lang->mr->linkList  = '浏览关联需求、bug、任务';
+$lang->mr->linkStory = '关联需求';
+$lang->mr->linkBug   = '关联Bug';
+$lang->mr->linkTask  = '关联任务';
+$lang->mr->unlink    = '取消关联需求、bug、任务';
+
 $lang->mr->id          = 'ID';
 $lang->mr->mriid       = "MR原始ID";
 $lang->mr->title       = '名称';
diff --git a/module/mr/view/link.html.php b/module/mr/view/link.html.php
index b4a71c13c2..8272cdc863 100644
--- a/module/mr/view/link.html.php
+++ b/module/mr/view/link.html.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * The view of productplan module of ZenTaoPMS.
+ * The view of mr link module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
  * @license     ZPL (http://zpl.pub/page/zplv12.html)
@@ -117,7 +117,7 @@
                 <td><?php echo $lang->story->stageList[$story->stage];?></td>
                 <td class='c-actions'>
                   <?php
-                  if($canBeChanged and common::hasPriv('productplan', 'unlinkStory'))
+                  if($canBeChanged and common::hasPriv('mr', 'unlink'))
                   {
                       $unlinkURL = $this->createLink('mr', 'unlink', "MRID=$MR->id&productID=$product->id&type=story&linkID=$story->id&confirm=yes");
                       echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"storyList\", confirmUnlinkStory)", '<i class="icon-unlink"></i>', '', "class='btn' title='{$lang->productplan->unlinkStory}'");
@@ -147,7 +147,7 @@
         <div class='linkBox cell hidden'></div>
         <form class='main-table table-bug' data-ride='table' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkBug', "planID=$MR->id&orderBy=$orderBy");?>">
           <table class='table has-sort-head' id='bugList'>
-            <?php $canBatchUnlink = $canBeChanged and common::hasPriv('productplan', 'batchUnlinkBug');?>
+            <?php $canBatchUnlink = $canBeChanged and common::hasPriv('mr', 'unlink');?>
             <?php $vars = "planID={$MR->id}&type=bug&orderBy=%s&link=$link&param=$param"; ?>
             <thead>
               <tr class='text-center'>
@@ -179,7 +179,7 @@
                 </td>
                 <td class='c-actions'>
                   <?php
-                  if($canBeChanged and common::hasPriv('productplan', 'unlinkBug'))
+                  if($canBeChanged and common::hasPriv('mr', 'unlink'))
                   {
                       $unlinkURL = $this->createLink('mr', 'unlink', "MRID=$MR->id&productID=$product->id&type=bug&linkID=$bug->id&confirm=yes");
                       echo html::a("javascript:ajaxDelete(\"$unlinkURL\", \"bugList\", confirmUnlinkBug)", '<i class="icon-unlink"></i>', '', "class='btn' title='{$lang->productplan->unlinkBug}'");
@@ -209,7 +209,7 @@
         <div class='linkBox cell hidden'></div>
         <form class='main-table table-task' data-ride='table' method='post' target='hiddenwin' action="<?php echo inLink('batchUnlinkTask', "planID=$MR->id&orderBy=$orderBy");?>">
           <table class='table has-sort-head' id='taskList'>
-            <?php $canBatchUnlink = $canBeChanged and common::hasPriv('productplan', 'batchUnlinkTask');?>
+            <?php $canBatchUnlink = $canBeChanged and common::hasPriv('mr', 'unlink');?>
             <?php $vars = "MRID={$MR->id}&type=task&orderBy=%s&link=$link&param=$param"; ?>
             <thead>
               <tr class='text-center'>