From 08f9e8e572a8354b43a52e388c047264b551455e Mon Sep 17 00:00:00 2001
From: lichengjun <lichengjun@easycorp.ltd>
Date: Fri, 20 Aug 2021 06:27:58 +0000
Subject: [PATCH] * Adjust GitLab MR Delete function.

---
 module/gitlab/control.php          |  1 +
 module/gitlab/view/browse.html.php |  2 +-
 module/mr/control.php              | 10 +++++++---
 module/mr/model.php                |  6 +++---
 module/mr/view/browse.html.php     | 14 +++++++-------
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index 4f9408b36a..deb6400639 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -33,6 +33,7 @@ class gitlab extends control
         foreach($gitlabList as $gitlab)
         {
             $token = $this->gitlab->apiGetCurrentUser($gitlab->url,$gitlab->token);
+
             $gitlab->isAdminToken = isset($token->is_admin) ? $token->is_admin : 0;
         }
 
diff --git a/module/gitlab/view/browse.html.php b/module/gitlab/view/browse.html.php
index 586860b235..b905dfd9c1 100644
--- a/module/gitlab/view/browse.html.php
+++ b/module/gitlab/view/browse.html.php
@@ -16,7 +16,7 @@
     <?php if(common::hasPriv('gitlab', 'create')) common::printLink('gitlab', 'create', "", "<i class='icon icon-plus'></i> " . $lang->gitlab->create, '', "class='btn btn-primary'");?>
   </div>
 </div>
-<?php if(empty($gitlabList)):?>
+<?php if(!empty($gitlabList)):?>
 <div class="table-empty-tip">
   <p>
     <span class="text-muted"><?php echo $lang->noData;?></span>
diff --git a/module/mr/control.php b/module/mr/control.php
index ff28a8efb4..9b50a2e0b9 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -63,10 +63,14 @@ class mr extends control
      * @access public
      * @return void
      */
-    public function delete($MR, $confim = 'no')
+    public function delete($id, $confim = 'no')
     {
-        if($confim != 'yes') die(js::confirm($this->lang->gitlab->confirmDelete, inlink('delete', "productID=$projectID&gitlabID=$gitlabID&MR=$MR&confirm=yes")));
-        $this->mr->apiDeleteMR($MR);
+        if($confim != 'yes') die(js::confirm($this->lang->gitlab->confirmDelete, inlink('delete', "id=$id&confirm=yes")));
+
+        $MRList = $this->mr->getByID($id);
+
+        $this->mr->apiDeleteMR($MRList->gitlabID, $MRList->projectID, $MRList->mrID);
+        $this->mr->deleteMR($id);
         die(js::reload('parent'));
     }
 
diff --git a/module/mr/model.php b/module/mr/model.php
index f2e1195416..b23869ed30 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -82,14 +82,14 @@ class mrModel extends model
      *
      * condition: when user deleting a repo.
      *
-     * @param  int    $MRID
+     * @param  int    $id
      * @access public
      * @return void
      */
-    public function deleteMR($MRID)
+    public function deleteMR($id)
     {
         $this->dao->delete()->from(TABLE_MR)
-            ->andWhere('mrID')->eq($MRID)
+            ->andWhere('id')->eq($id)
             ->exec();
     }
 
diff --git a/module/mr/view/browse.html.php b/module/mr/view/browse.html.php
index fd22d53608..01c02e9546 100644
--- a/module/mr/view/browse.html.php
+++ b/module/mr/view/browse.html.php
@@ -25,32 +25,32 @@
           <th class='w-100px text-left'><?php common::printOrderLink('sourceBranch', $orderBy, $vars, $lang->mr->sourceBranch); ?></th>
           <th class='w-100px text-left'><?php common::printOrderLink('targetBranch', $orderBy, $vars, $lang->mr->targetBranch); ?></th>
           <th class='w-100px text-left'><?php common::printOrderLink('status', $orderBy, $vars, $lang->mr->status); ?></th>
-          <th class='w-100px text-left'><?php common::printOrderLink('mrStatus', $orderBy, $vars, $lang->mr->mrStatus); ?></th>
+          <th class='w-100px text-left'><?php common::printOrderLink('canMerge', $orderBy, $vars, $lang->mr->canMerge); ?></th>
           <th class='w-100px c-actions-4'><?php echo $lang->actions; ?></th>
         </tr>
       </thead>
       <tbody>
-        <?php foreach($mrList as $mr):?>
+        <?php foreach($MRList as $mr):?>
         <tr>
           <td class='text'><?php echo $mr->id; ?></td>
           <td class='text'><?php echo $mr->name; ?></td>
-          <td class='text'><?php echo $mr->target_branch; ?></td>
-          <td class='text'><?php echo $mr->source_branch; ?></td>
+          <td class='text'><?php echo $mr->targetBranch; ?></td>
+          <td class='text'><?php echo $mr->sourceBranch; ?></td>
           <td class='text'><?php echo $mr->status; ?></td>
-          <td class='text'><?php echo $mr->mrStatus; ?></td>
+          <td class='text'><?php echo $mr->canMerge; ?></td>
           <td class='text-left c-actions'>
             <?php
             common::printLink('mr', 'list', "mr={$mr->id}", '<i class="icon icon-review"></i>', '', "title='{$lang->mr->list}' class='btn btn-info'");
             common::printLink('mr', 'create', "mr={$mr->id}", '<i class="icon icon-plus"></i>', '', "title='{$lang->mr->create}' class='btn btn-info'");
             common::printLink('mr', 'edit', "mrID=$mr->id&objectID=$objectID", '<i class="icon icon-edit"></i>', '', "title='{$lang->mr->edit}' class='btn btn-info'");
-            if(common::hasPriv('mr', 'delete')) echo html::a($this->createLink('mr', 'delete', "productID=$mr->projectID&gitlabID=$mr->gitlabID&mrID=$mr->mrID"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->mr->delete}' class='btn'");
+            if(common::hasPriv('mr', 'delete')) echo html::a($this->createLink('mr', 'delete', "id=$mr->id"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->mr->delete}' class='btn'");
             ?>
           </td>
         </tr>
         <?php endforeach;?>
       </tbody>
     </table>
-    <?php if($mrList):?>
+    <?php if($MRList):?>
     <div class='table-footer'><?php $pager->show('rignt', 'pagerjs');?></div>
     <?php endif;?>
   </form>