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

* Fix bug #17343, Finish task #45443.

Browse Source
This commit is contained in:
liyuchun
2021-12-10 09:42:21 +08:00
parent 8e4803745c
commit 0ab14d8df2
4 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/lang/en.php
+2
View File
@@ -91,12 +91,14 @@ $lang->gitlab->apiError[1] = 'public is not allowed in a private group.';
$lang->gitlab->apiError[2] = 'is too short (minimum is 8 characters)';
$lang->gitlab->apiError[3] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->gitlab->apiError[4] = 'Branch already exists';
$lang->gitlab->apiError[5] = 'Failed to save group {:path=>["has already been taken"]}';
$lang->gitlab->errorLang[0] = 'You cannot set Internal as its Visibility Level, if it is private in GitLab.';
$lang->gitlab->errorLang[1] = 'You cannot set Public as its Visibility Level, if it is private in GitLab.';
$lang->gitlab->errorLang[2] = 'Password is too short (minimum is 8 characters)';
$lang->gitlab->errorLang[3] = 'It should contain only letters, digits, underscore, hyphen and period. It should not start with hypen, or end with .git or .atom.';
$lang->gitlab->errorLang[4] = 'Branch already exists.';
$lang->gitlab->errorLang[5] = 'Failed to save group, path has already been taken.';
$lang->gitlab->project = new stdclass;
$lang->gitlab->project->id = "Project ID";
module/gitlab/lang/zh-cn.php
+2
View File
@@ -91,12 +91,14 @@ $lang->gitlab->apiError[1] = 'public is not allowed in a private group.';
$lang->gitlab->apiError[2] = 'is too short (minimum is 8 characters)';
$lang->gitlab->apiError[3] = "can contain only letters, digits, '_', '-' and '.'. Cannot start with '-', end in '.git' or end in '.atom'";
$lang->gitlab->apiError[4] = 'Branch already exists';
$lang->gitlab->apiError[5] = 'Failed to save group {:path=>["has already been taken"]}';
$lang->gitlab->errorLang[0] = '私有分组的项目，可见性级别不能设为内部。';
$lang->gitlab->errorLang[1] = '私有分组的项目，可见性级别不能设为公开。';
$lang->gitlab->errorLang[2] = '密码太短（最少8个字符）';
$lang->gitlab->errorLang[3] = "只能包含字母、数字、'.'-'和'.'。不能以'-'开头、以'.git'结尾或以'.atom'结尾。";
$lang->gitlab->errorLang[4] = '分支名已存在。';
$lang->gitlab->errorLang[5] = '保存失败，群组URL路径已经被使用。';
$lang->gitlab->project = new stdclass;
$lang->gitlab->project->id = "项目ID";
module/gitlab/model.php
+42 -42
View File
@@ -2050,15 +2050,15 @@ class gitlabModel extends model
if(empty($project->path)) dao::$errors['path'][] = $this->lang->gitlab->project->emptyPathError;
if(dao::isError()) return false;
$reponse = $this->apiCreateProject($gitlabID, $project);
$response = $this->apiCreateProject($gitlabID, $project);
if(!empty($reponse->id))
if(!empty($response->id))
{
$this->loadModel('action')->create('gitlabproject', $reponse->id, 'created', '', $reponse->name);
$this->loadModel('action')->create('gitlabproject', $response->id, 'created', '', $response->name);
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
@@ -2074,15 +2074,15 @@ class gitlabModel extends model
if(empty($project->name)) dao::$errors['name'][] = $this->lang->gitlab->project->emptyNameError;
if(dao::isError()) return false;
$reponse = $this->apiUpdateProject($gitlabID, $project);
$response = $this->apiUpdateProject($gitlabID, $project);
if(!empty($reponse->id))
if(!empty($response->id))
{
$this->loadModel('action')->create('gitlabproject', $project->id, 'edited', '', $project->name);
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
@@ -2119,11 +2119,11 @@ class gitlabModel extends model
}
}
$reponse = $this->apiCreateUser($gitlabID, $user);
$response = $this->apiCreateUser($gitlabID, $user);
if(!empty($reponse->id))
if(!empty($response->id))
{
$this->loadModel('action')->create('gitlabuser', $reponse->id, 'created', '', $reponse->name);
$this->loadModel('action')->create('gitlabuser', $response->id, 'created', '', $response->name);
/* Bind user. */
if($user->account)
@@ -2132,13 +2132,13 @@ class gitlabModel extends model
$userBind->providerID = $gitlabID;
$userBind->providerType = 'gitlab';
$userBind->account = $user->account;
$userBind->openID = $reponse->id;
$userBind->openID = $response->id;
$this->dao->insert(TABLE_OAUTH)->data($userBind)->exec();
}
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
@@ -2179,14 +2179,14 @@ class gitlabModel extends model
}
}
$reponse = $this->apiUpdateUser($gitlabID, $user);
$response = $this->apiUpdateUser($gitlabID, $user);
if(!empty($reponse->id))
if(!empty($response->id))
{
$this->loadModel('action')->create('gitlabuser', $reponse->id, 'edited', '', $reponse->name);
$this->loadModel('action')->create('gitlabuser', $response->id, 'edited', '', $response->name);
/* Delete old bind. */
$this->dao->delete()->from(TABLE_OAUTH)->where('providerType')->eq('gitlab')->andWhere('providerID')->eq($gitlabID)->andWhere('openID')->eq($reponse->id)->andWhere('account')->ne($user->account)->exec();
$this->dao->delete()->from(TABLE_OAUTH)->where('providerType')->eq('gitlab')->andWhere('providerID')->eq($gitlabID)->andWhere('openID')->eq($response->id)->andWhere('account')->ne($user->account)->exec();
/* Bind user. */
if($user->account && $changeBind)
{
@@ -2194,13 +2194,13 @@ class gitlabModel extends model
$userBind->providerID = $gitlabID;
$userBind->providerType = 'gitlab';
$userBind->account = $user->account;
$userBind->openID = $reponse->id;
$userBind->openID = $response->id;
$this->dao->replace(TABLE_OAUTH)->data($userBind)->exec();
}
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
@@ -2218,15 +2218,15 @@ class gitlabModel extends model
if(empty($group->path)) dao::$errors['path'][] = $this->lang->gitlab->group->path . $this->lang->gitlab->group->emptyError;
if(dao::isError()) return false;
$reponse = $this->apiCreateGroup($gitlabID, $group);
$response = $this->apiCreateGroup($gitlabID, $group);
if(!empty($reponse->id))
if(!empty($response->id))
{
$this->loadModel('action')->create('gitlabgroup', $reponse->id, 'created', '', $reponse->name);
$this->loadModel('action')->create('gitlabgroup', $response->id, 'created', '', $response->name);
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
@@ -2243,15 +2243,15 @@ class gitlabModel extends model
if(empty($group->name)) dao::$errors['name'][] = $this->lang->gitlab->group->name . $this->lang->gitlab->group->emptyError;
if(dao::isError()) return false;
$reponse = $this->apiUpdateGroup($gitlabID, $group);
$response = $this->apiUpdateGroup($gitlabID, $group);
if(!empty($reponse->id))
if(!empty($response->id))
{
$this->loadModel('action')->create('gitlabgroup', $reponse->id, 'edited', '', $reponse->name);
$this->loadModel('action')->create('gitlabgroup', $response->id, 'edited', '', $response->name);
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
@@ -2270,41 +2270,41 @@ class gitlabModel extends model
if(empty($branch->ref)) dao::$errors['ref'][] = $this->lang->gitlab->branch->from . $this->lang->gitlab->emptyError;
if(dao::isError()) return false;
$reponse = $this->apiCreateBranch($gitlabID, $projectID, $branch);
$response = $this->apiCreateBranch($gitlabID, $projectID, $branch);
if(!empty($reponse->name))
if(!empty($response->name))
{
$this->loadModel('action')->create('gitlabbranch', 0, 'created', '', $reponse->name);
$this->loadModel('action')->create('gitlabbranch', 0, 'created', '', $response->name);
return true;
}
return $this->apiErrorHandling($reponse);
return $this->apiErrorHandling($response);
}
/**
* Api error handling.
*
* @param object $reponse
* @param object $response
* @access public
* @return bool
*/
public function apiErrorHandling($reponse)
public function apiErrorHandling($response)
{
if(!empty($reponse->error))
if(!empty($response->error))
{
dao::$errors[] = $reponse->error;
dao::$errors[] = $response->error;
return false;
}
if(!empty($reponse->message))
if(!empty($response->message))
{
if(is_string($reponse->message))
if(is_string($response->message))
{
$errorKey = array_search($reponse->message, $this->lang->gitlab->apiError);
dao::$errors[] = $errorKey === false ? $reponse->message : zget($this->lang->gitlab->errorLang, $errorKey);
$errorKey = array_search($response->message, $this->lang->gitlab->apiError);
dao::$errors[] = $errorKey === false ? $response->message : zget($this->lang->gitlab->errorLang, $errorKey);
}
else
{
foreach($reponse->message as $field => $fieldErrors)
foreach($response->message as $field => $fieldErrors)
{
foreach($fieldErrors as $error)
{
@@ -2315,7 +2315,7 @@ class gitlabModel extends model
}
}
if(!$reponse) dao::$errors[] = false;
if(!$response) dao::$errors[] = false;
return false;
}
@@ -2395,9 +2395,9 @@ class gitlabModel extends model
$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($branch) && !empty($singleBranch->id)) $this->apiDeleteBranchPriv($gitlabID, $projectID, $branch);
$response = $this->apiCreateBranchPriv($gitlabID, $projectID, $priv);
$response = $this->apiCreateBranchPriv($gitlabID, $projectID, $priv);
if(!empty($response->id))
{
module/gitlab/view/binduser.html.php
+3 -2
View File
@@ -21,7 +21,7 @@
<thead>
<tr>
<th colspan='2'><?php echo $lang->gitlab->gitlabAccount;?></th>
<th><?php echo $lang->gitlab->zentaoAccount;?></th>
<th class='w-150px'><?php echo $lang->gitlab->zentaoAccount;?></th>
<th class='w-150px'><?php echo $lang->gitlab->bindingStatus;?></th>
</tr>
</thead>
@@ -51,7 +51,8 @@
<td><?php echo html::select("zentaoUsers[$gitlabUser->id]", $userPairs, $gitlabUser->zentaoAccount, "class='form-control select chosen'" );?></td>
<td>
<?php if(isset($bindedUsers[$gitlabUser->zentaoAccount])):?>
<?php if(!empty(zget($userPairs, $gitlabUser->zentaoAccount, ''))):?>
<?php $zentaoAccount = zget($userPairs, $gitlabUser->zentaoAccount, '');?>
<?php if(!empty($zentaoAccount)):?>
<?php echo $lang->gitlab->binded;?>
<?php else:?>
<?php echo '<span class="text-red">' . $lang->gitlab->bindedError . '</span>';?>