* Add create and edit auth.

2021-12-09 02:14:37 +00:00
parent 8249473e63
commit a8abcb6c9f
7 changed files with 30 additions and 16 deletions
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -746,14 +746,15 @@ class gitlab extends control
    }

    /**
-     * Set a gitlab branch priv.
+     * Set a gitlab branch protect.
     *
-     * @param  int     $gitlabID
-     * @param  int     $projectID
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @param  string $branch
     * @access public
     * @return void
     */
-    public function setBranchPriv($gitlabID, $projectID, $branch = '')
+    public function createBranchPriv($gitlabID, $projectID, $branch = '')
    {
        if($_POST)
        {
@@ -769,11 +770,11 @@ class gitlab extends control
        $branchPriv->push_access_level  = 40;

        $gitlab = $this->gitlab->getByID($gitlabID);
-        $title  = $this->lang->gitlab->branch->createBranchPriv;
+        $title  = $this->lang->gitlab->createBranchPriv;

        if($branch)
        {
-            $title      = $this->lang->gitlab->branch->editBranchPriv;
+            $title      = $this->lang->gitlab->editBranchPriv;
            $branchPriv = $this->gitlab->apiGetSingleBranchPriv($gitlabID, $projectID, $branch);
            $branchPriv->merge_access_level = $this->gitlab->checkAccessLevel($branchPriv->merge_access_levels);
            $branchPriv->push_access_level  = $this->gitlab->checkAccessLevel($branchPriv->push_access_levels);
@@ -799,6 +800,20 @@ class gitlab extends control
        $this->display();
    }

+    /**
+     * Edit a gitlab branch protect.
+     *
+     * @param  int    $gitlabID
+     * @param  int    $projectID
+     * @param  string $branch
+     * @access public
+     * @return void
+     */
+    public function editBranchPriv($gitlabID, $projectID, $branch)
+    {
+        echo $this->fetch('gitlab', 'createBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch");
+    }
+
    /**
     * Delete a gitlab branch priv.
     *
--- a/module/gitlab/css/createbranchpriv.css
+++ b/module/gitlab/css/createbranchpriv.css
--- a/module/gitlab/lang/en.php
+++ b/module/gitlab/lang/en.php
@@ -46,7 +46,8 @@ $lang->gitlab->deleteUser           = 'Delete user';
 $lang->gitlab->manageGroupMembers   = 'Manage group member';
 $lang->gitlab->createWebhook        = 'Create Webhook';
 $lang->gitlab->browseBranchPriv     = 'Protect branch';
-$lang->gitlab->setBranchPriv        = 'Set up branch protected';
+$lang->gitlab->createBranchPriv     = 'Cerate branch protected';
+$lang->gitlab->editBranchPriv       = 'Edit branch protected';
 $lang->gitlab->deleteBranchPriv     = 'Delete branch protected';

 $lang->gitlab->id             = 'ID';
@@ -183,8 +184,6 @@ $lang->gitlab->branch->pushAllowed                 = "Push Allowed";
 $lang->gitlab->branch->placeholderSearch           = "Branch name";
 $lang->gitlab->branch->placeholderSelect           = "Branch name";
 $lang->gitlab->branch->confirmDelete               = 'Branch will be writable for developers. Are you sure?';
-$lang->gitlab->branch->createBranchPriv            = 'Create branch protection';
-$lang->gitlab->branch->editBranchPriv              = 'Edit branch protection';
 $lang->gitlab->branch->branchCreationLevelList[40] = "Maintainers";
 $lang->gitlab->branch->branchCreationLevelList[30] = "Developers + Maintainers";
 $lang->gitlab->branch->branchCreationLevelList[0]  = "No one";
--- a/module/gitlab/lang/zh-cn.php
+++ b/module/gitlab/lang/zh-cn.php
@@ -46,7 +46,8 @@ $lang->gitlab->deleteUser           = '删除用户';
 $lang->gitlab->manageGroupMembers   = '群组成员管理';
 $lang->gitlab->createWebhook        = '创建Webhook';
 $lang->gitlab->browseBranchPriv     = '分支保护管理';
-$lang->gitlab->setBranchPriv        = '设置分支保护';
+$lang->gitlab->createBranchPriv     = '创建分支保护';
+$lang->gitlab->editBranchPriv       = '编辑分支保护';
 $lang->gitlab->deleteBranchPriv     = '删除分支保护';

 $lang->gitlab->id             = 'ID';
@@ -183,8 +184,6 @@ $lang->gitlab->branch->pushAllowed                 = "允许推送到";
 $lang->gitlab->branch->placeholderSearch           = "请输入分支名称";
 $lang->gitlab->branch->placeholderSelect           = "请选择分支";
 $lang->gitlab->branch->confirmDelete               = '确定删除分支保护？';
-$lang->gitlab->branch->createBranchPriv            = '创建分支保护';
-$lang->gitlab->branch->editBranchPriv              = '编辑分支保护';
 $lang->gitlab->branch->branchCreationLevelList[40] = "维护者";
 $lang->gitlab->branch->branchCreationLevelList[30] = "开发者 + 维护者";
 $lang->gitlab->branch->branchCreationLevelList[0]  = "禁止";
--- a/module/gitlab/view/browsebranchpriv.html.php
+++ b/module/gitlab/view/browsebranchpriv.html.php
@@ -24,7 +24,7 @@
    </div>
  </div>
  <div class="btn-toolbar pull-right">
-    <?php if(common::hasPriv('gitlab', 'setBranchPriv')) common::printLink('gitlab', 'setBranchPriv', "gitlabID=$gitlabID&projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->gitlab->branch->createBranchPriv, '', "class='btn btn-primary'");?>
+    <?php if(common::hasPriv('gitlab', 'createBranchPriv')) common::printLink('gitlab', 'createBranchPriv', "gitlabID=$gitlabID&projectID=$projectID", "<i class='icon icon-plus'></i> " . $lang->gitlab->createBranchPriv, '', "class='btn btn-primary'");?>
  </div>
 </div>
 <?php if(empty($branchList)):?>
@@ -32,7 +32,7 @@
  <p>
    <span class="text-muted"><?php echo $lang->noData;?></span>
    <?php if(empty($keyword) and common::hasPriv('gitlab', 'createProject')):?>
-    <?php echo html::a($this->createLink('gitlab', 'setBranchPriv', "gitlabID=$gitlabID&projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->gitlab->branch->createBranchPriv, '', "class='btn btn-info'");?>
+    <?php echo html::a($this->createLink('gitlab', 'createBranchPriv', "gitlabID=$gitlabID&projectID=$projectID"), "<i class='icon icon-plus'></i> " . $lang->gitlab->createBranchPriv, '', "class='btn btn-info'");?>
    <?php endif;?>
  </p>
 </div>
@@ -59,7 +59,7 @@
          <td class='text' title="<?php echo $levelLang[$branch->push_access_level];?>"><?php echo $levelLang[$branch->push_access_level];?></td>
          <td class='c-actions text-left'>
            <?php
-            if(common::hasPriv('gitlab', 'setBranchPriv')) common::printLink('gitlab', 'setBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch->name", "<i class='icon icon-edit'></i> ", '', "title={$lang->gitlab->branch->editBranchPriv} class='btn btn-primary'");
+            if(common::hasPriv('gitlab', 'editBranchPriv')) common::printLink('gitlab', 'editBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch->name", "<i class='icon icon-edit'></i> ", '', "title={$lang->gitlab->editBranchPriv} class='btn btn-primary'");
            if(common::hasPriv('gitlab', 'deleteBranchPriv')) echo html::a($this->createLink('gitlab', 'deleteBranchPriv', "gitlabID=$gitlabID&projectID=$projectID&branch=$branch->name"), '<i class="icon-trash"></i>', 'hiddenwin', "title='{$lang->gitlab->deleteBranchPriv}' class='btn'");
            ?>
          </td>
--- a/module/gitlab/view/createbranchpriv.html.php
+++ b/module/gitlab/view/createbranchpriv.html.php
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1249,7 +1249,8 @@ $lang->resource->gitlab->webhook              = 'webhook';
 $lang->resource->gitlab->createWebhook        = 'createWebhook';
 $lang->resource->gitlab->manageProjectMembers = 'manageProjectMembers';
 $lang->resource->gitlab->browseBranchPriv     = 'browseBranchPriv';
-$lang->resource->gitlab->setBranchPriv        = 'setBranchPriv';
+$lang->resource->gitlab->createBranchPriv     = 'createBranchPriv';
+$lang->resource->gitlab->editBranchPriv       = 'editBranchPriv';
 $lang->resource->gitlab->deleteBranchPriv     = 'deleteBranchPriv';

 $lang->gitlab->methodOrder[5]   = 'browse';