From c26309ad134fbf7fb1f3c56ee80c8b60daa06b9d Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Thu, 30 Dec 2021 17:49:04 +0800
Subject: [PATCH]  * Fix bug #18087,18092.

---
 module/gitlab/control.php | 2 +-
 module/gitlab/model.php   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index c202c7483c..b46e87bae5 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -1069,7 +1069,7 @@ class gitlab extends control
         }
 
         $gitlabTags   = $this->gitlab->apiGetTags($gitlabID, $projectID);
-        $protectTags  = $this->gitlab->apiGetBranchPrivs($gitlabID, $projectID, '', 'name_asc');
+        $protectTags  = $this->gitlab->apiGetTagPrivs($gitlabID, $projectID, '', 'name_asc');
         $protectNames = array_keys($protectTags);
 
         $tags = array();
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 511b8ca025..36eb26016e 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -2566,11 +2566,13 @@ class gitlabModel extends model
     {
         $priv = fixer::input('post')->get();
         if(empty($priv->name)) dao::$errors['name'][] = $this->lang->gitlab->branch->emptyPrivNameError;
+        if(dao::isError()) return false;
+
         $singleTag = $this->apiGetSingleTagPriv($gitlabID, $projectID, $priv->name);
         if(empty($tag) && !empty($singleTag->id)) dao::$errors['name'][] = $this->lang->gitlab->tag->issetPrivNameError;
         if(dao::isError()) return false;
-        if(!empty($tag) && !empty($singleTag->name)) $this->apiDeleteTagPriv($gitlabID, $projectID, $tag);
 
+        if(!empty($tag) && !empty($singleTag->name)) $this->apiDeleteTagPriv($gitlabID, $projectID, $tag);
         $response = $this->apiCreateTagPriv($gitlabID, $projectID, $priv);
 
         if(!empty($response->id))