From 42a5e9bf782095050ef7bdc2f50bfbb3ba451e69 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Thu, 2 Dec 2021 09:32:45 +0000
Subject: [PATCH] * Fix bug#16884,16856

---
 module/gitlab/css/managegroupmembers.css   | 1 +
 module/gitlab/css/manageprojectmembers.css | 1 +
 module/mr/control.php                      | 3 +--
 module/mr/js/view.js                       | 2 +-
 module/mr/view/view.html.php               | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 module/gitlab/css/managegroupmembers.css
 create mode 100644 module/gitlab/css/manageprojectmembers.css

diff --git a/module/gitlab/css/managegroupmembers.css b/module/gitlab/css/managegroupmembers.css
new file mode 100644
index 0000000000..0d940091ae
--- /dev/null
+++ b/module/gitlab/css/managegroupmembers.css
@@ -0,0 +1 @@
+.table-form {min-width: 600px;}
diff --git a/module/gitlab/css/manageprojectmembers.css b/module/gitlab/css/manageprojectmembers.css
new file mode 100644
index 0000000000..0d940091ae
--- /dev/null
+++ b/module/gitlab/css/manageprojectmembers.css
@@ -0,0 +1 @@
+.table-form {min-width: 600px;}
diff --git a/module/mr/control.php b/module/mr/control.php
index 9e484e791d..aba3903a58 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -402,8 +402,7 @@ class mr extends control
         $MR = $this->mr->getByID($MRID);
         $result = $this->mr->close($MR);
 
-        if($result['result'] == 'fali') return $this->send($result);
-        die(js::locate($result['locate'], 'parent'));
+        return $this->send($result);
     }
 
     /**
diff --git a/module/mr/js/view.js b/module/mr/js/view.js
index f75fc67687..a6433ab5d2 100644
--- a/module/mr/js/view.js
+++ b/module/mr/js/view.js
@@ -1,6 +1,6 @@
 $(document).ready(function()
   {
-    $('#mergeButton').click(function()
+    $('#mergeButton,.mergeButton').click(function()
       {
         link = $(this).attr('href');
         $.getJSON(link, function(response)
diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php
index 7b1b1f5a3e..62b842c95e 100644
--- a/module/mr/view/view.html.php
+++ b/module/mr/view/view.html.php
@@ -111,7 +111,7 @@
               <?php echo html::a(inlink('approval', "mr=$MR->id&action=approve", '', true), '<i class="icon icon-ok"></i> ' . $lang->mr->approve, '', "id='mergeButton' class='btn iframe showinonlybody'"); ?>
               <?php endif;?>
               <?php echo html::a(inlink('approval', "mr=$MR->id&action=reject", '', true), '<i class="icon icon-bug"></i> ' . $lang->mr->reject, '', "id='mergeButton' class='btn iframe showinonlybody'" . ($MR->approvalStatus == 'rejected' ? 'disabled' : '')); ?>
-              <?php common::printIcon('mr', 'close', "mr=$MR->id", $MR, 'button', 'off', 'hiddenwin');?>
+              <?php echo html::a(inlink('close', "mr=$MR->id"), '<i class="icon icon-off"></i> ' . $lang->mr->close, '', "class='btn mergeButton'"); ?>
               <?php echo html::a(inlink('edit', "mr=$MR->id"), '<i class="icon icon-edit"></i> ' . str_replace($lang->mr->common, '', $lang->mr->edit), '', "id='mergeButton' class='btn'"); ?>
             <?php endif;?>
             <?php if($rawMR->state == 'closed') echo html::a(inlink('reopen', "mr=$MR->id"), '<i class="icon icon-restart"></i> ' . $lang->mr->reopen, '', "id='mergeButton' class='btn'"); ?>