* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.* Add delete MR function.

module/mr/control.php

@@ -72,8 +72,23 @@ class mr extends control
         $this->display();
     }
 
-    public function delete()
+    /**
+     * Delete a mr.
+     *
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @param  int    $mrID
+     * @access public
+     * @return void
+     */
+    public function delete($gitlabID, $projectID, $mrID, $confim = 'no')
     {
+        if($confim != 'yes') die(js::confirm($this->lang->gitlab->confirmDelete, inlink('delete', "productID=$projectID&gitlabID=$gitlabID&mrID=$mrID&confirm=yes")));
+
+        $this->mr->apiDeleteMR($gitlabID, $projectID, $mrID);
+
+        $this->gitlab->delete(TABLE_PIPELINE, $id);
+        die(js::reload('parent'));
     }
 
     public function update()

module/mr/lang/zh-cn.php

@@ -20,6 +20,7 @@ $lang->mr->reviewer    = '评审人';
 $lang->mr->link        = 'GitLab链接';
 $lang->mr->mrStatus    = '合并状态';
 
+$lang->mr->confirmDelete = '确认删除该merge request吗？';
 $lang->mr->sourceProject = '源项目';
 $lang->mr->sourceBranch  = '源分支';
 $lang->mr->targetProject = '目标项目';

module/mr/model.php

@@ -74,6 +74,9 @@ class mrModel extends model
                     $list = new stdclass;
 
                     $list->id            = $subMR->id;
+                    $list->projectID     = $subMR->project_id;
+                    $list->gitlabID      = $mr->gitlabID;
+                    $list->mrID          = $subMR->iid;
                     $list->name          = $subMR->title;
                     $list->target_branch = $subMR->target_branch;
                     $list->source_branch = $subMR->source_branch;
@@ -87,6 +90,26 @@ class mrModel extends model
         }
     }
 
+    /**
+     * Delete MR.
+     *
+     * condition: when user deleting a repo.
+     *
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @param  int    $mrID
+     * @access public
+     * @return void
+     */
+    public function deleteMR($gitlabID, $projectID, $mrID )
+    {
+        $this->dao->delete()->from(TABLE_MR)
+            ->where('gitlabID')->eq($gitlabID)
+            ->andWhere('projectID')->eq($projectID)
+            ->andWhere('mrID')->eq($mrID)
+            ->exec();
+    }
+
     /**
      * Get gitlab pairs.
      *

module/mr/view/browse.html.php

@@ -43,7 +43,7 @@
             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', "mrID=$mr->id&objectID=$objectID"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->mr->delete}' class='btn'");
+            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'");
             ?>
           </td>
         </tr>