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

* Fix bug #16903.

Browse Source
This commit is contained in:
liyuchun
2021-12-01 13:46:48 +08:00
parent 8a8d0da75e
commit b91bd45f85
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+8 -2
View File
@@ -2064,6 +2064,7 @@ class gitlabModel extends model
$this->loadModel('action')->create('gitlabproject', $project->id, 'edited', '', $project->name);
return true;
}
return $this->apiErrorHandling($reponse);
}
@@ -2250,14 +2251,19 @@ class gitlabModel extends model
}
if(!empty($reponse->message))
{
if(is_string($reponse->message)) dao::$errors[] = $reponse->message;
if(is_string($reponse->message))
{
$errorKey = array_search($reponse->message, $this->lang->gitlab->apiError);
dao::$errors[] = $errorKey === false ? $reponse->message : zget($this->lang->gitlab->errorLang, $errorKey);
}
else
{
foreach($reponse->message as $field => $fieldErrors)
{
foreach($fieldErrors as $error)
{
if($error) dao::$errors[$field][] = $error;
$errorKey = array_search($error, $this->lang->gitlab->apiError);
if($error) dao::$errors[$field][] = $errorKey === false ? $error : zget($this->lang->gitlab->errorLang, $errorKey);
}
}
}