From b0ad47a7e940097efc016ee896f271d15e5a1883 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Thu, 11 Aug 2022 16:49:11 +0800
Subject: [PATCH] * Modify edit mr page.

---
 module/gogs/model.php        | 2 +-
 module/mr/control.php        | 9 +++------
 module/mr/model.php          | 2 +-
 module/mr/view/edit.html.php | 3 +--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/module/gogs/model.php b/module/gogs/model.php
index 2a536f04d7..536cbdd3fa 100644
--- a/module/gogs/model.php
+++ b/module/gogs/model.php
@@ -559,7 +559,7 @@ class gogsModel extends model
         $newBranches = array();
         foreach($branches as $branch)
         {
-            $branch->name = $branch->branch_name;
+            $branch->name = $branch->Name;
             if(empty($keyword) || stristr($branch->name, $keyword)) $newBranches[] = $branch;
         }
 
diff --git a/module/mr/control.php b/module/mr/control.php
index 21a2795d9a..a5670e0fe6 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -177,13 +177,10 @@ class mr extends control
         $branchList = $this->loadModel($scm)->getBranches($MR->hostID, $MR->targetProject);
 
         $MR->canDeleteBranch = true;
-        if($scm != 'gogs')
+        $branchPrivs = $this->loadModel($scm)->apiGetBranchPrivs($MR->hostID, $MR->sourceProject);
+        foreach($branchPrivs as $priv)
         {
-            $branchPrivs = $this->loadModel($scm)->apiGetBranchPrivs($MR->hostID, $MR->sourceProject);
-            foreach($branchPrivs as $priv)
-            {
-                if($MR->canDeleteBranch and $priv->name == $MR->sourceBranch) $MR->canDeleteBranch = false;
-            }
+            if($MR->canDeleteBranch and $priv->name == $MR->sourceBranch) $MR->canDeleteBranch = false;
         }
 
         $targetBranchList = array();
diff --git a/module/mr/model.php b/module/mr/model.php
index 0da57f512f..b1949e91b0 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -1244,7 +1244,7 @@ class mrModel extends model
         }
         else
         {
-            $url = sprintf($this->loadModel('gitea')->getApiRoot($hostID), "/repos/$projectID/pulls/$MRID/commits");
+            $url = sprintf($this->loadModel($host->type)->getApiRoot($hostID), "/repos/$projectID/pulls/$MRID/commits");
         }
         return json_decode(commonModel::http($url));
     }
diff --git a/module/mr/view/edit.html.php b/module/mr/view/edit.html.php
index 7f1b3b697d..18a4a95711 100644
--- a/module/mr/view/edit.html.php
+++ b/module/mr/view/edit.html.php
@@ -80,8 +80,7 @@
             <th><?php echo $lang->mr->removeSourceBranch;?></th>
             <td colspan='1'>
               <div class="checkbox-primary" title="<?php echo $lang->mr->notDelbranch;?>">
-                <?php $checked = $MR->canDeleteBranch and $MR->removeSourceBranch== '1' ? 'checked' : '' ?>
-                <input type="checkbox" <?php echo $checked;?> <?php if(!$MR->canDeleteBranch) echo 'disabled';?> name="removeSourceBranch" value="1" id="removeSourceBranch">
+                <input type="checkbox" <?php echo ($MR->canDeleteBranch and $MR->removeSourceBranch == '1') ? 'checked' : '';?> <?php if(!$MR->canDeleteBranch) echo 'disabled';?> name="removeSourceBranch" value="1" id="removeSourceBranch">
                 <label for="removeSourceBranch"></label>
               </div>
             </td>