Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #17956.

Browse Source
This commit is contained in:
liyuchun
2022-01-05 11:20:43 +08:00
parent 3125190938
commit 818a1d7332
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+23 -9
View File
@@ -2510,12 +2510,20 @@ class gitlabModel extends model
public function createBranchPriv($gitlabID, $projectID, $branch = '')
{
$priv = fixer::input('post')->get();
if(empty($priv->name)) dao::$errors['name'][] = $this->lang->gitlab->branch->emptyPrivNameError;
$singleBranch = $this->apiGetSingleBranchPriv($gitlabID, $projectID, $priv->name);
if(empty($branch) && !empty($singleBranch->id)) dao::$errors['name'][] = $this->lang->gitlab->branch->issetPrivNameError;
if(dao::isError()) return false;
if(!empty($branch) && !empty($singleBranch->id)) $this->apiDeleteBranchPriv($gitlabID, $projectID, $branch);
if(empty($priv->name))
{
dao::$errors['name'][] = $this->lang->gitlab->branch->emptyPrivNameError;
return false;
}
$singleBranch = $this->apiGetSingleBranchPriv($gitlabID, $projectID, $priv->name);
if(empty($branch) && !empty($singleBranch->id))
{
dao::$errors['name'][] = $this->lang->gitlab->branch->issetPrivNameError;
return false;
}
if(!empty($branch) && !empty($singleBranch->id)) $this->apiDeleteBranchPriv($gitlabID, $projectID, $branch);
$response = $this->apiCreateBranchPriv($gitlabID, $projectID, $priv);
if(!empty($response->id))
@@ -2575,12 +2583,18 @@ class gitlabModel extends model
public function createTagPriv($gitlabID, $projectID, $tag = '')
{
$priv = fixer::input('post')->get();
if(empty($priv->name)) dao::$errors['name'][] = $this->lang->gitlab->tag->emptyPrivNameError;
if(dao::isError()) return false;
if(empty($priv->name))
{
dao::$errors['name'][] = $this->lang->gitlab->tag->emptyPrivNameError;
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->id))
{
dao::$errors['name'][] = $this->lang->gitlab->tag->issetPrivNameError;
return false;
}
if(!empty($tag) && !empty($singleTag->name)) $this->apiDeleteTagPriv($gitlabID, $projectID, $tag);
$response = $this->apiCreateTagPriv($gitlabID, $projectID, $priv);