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

* Fix bug when create gitlab server.

Browse Source
This commit is contained in:
liyuchun
2022-05-11 06:58:54 +00:00
parent c60e32238c
commit 356aa74ca1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+3 -3
View File
@@ -3234,9 +3234,9 @@ class bugModel extends model
/**
* Build bug menu.
*
* @param object $bug
* @param string $type
*
* @param object $bug
* @param string $type
* @access public
* @return string
*/
module/gitlab/control.php
+1 -1
View File
@@ -259,7 +259,7 @@ class gitlab extends control
$user = $this->gitlab->apiGetCurrentUser($gitlab->url, $gitlab->token, true);
if(!is_object($user)) return $this->send(array('result' => 'fail', 'message' => array('url' => array(sprintf($this->lang->gitlab->hostError, $this->config->gitlab->minCompatibleVersion)))));
if(isset($user->error)) return $this->send(array('result' => 'fail', 'message' => array('token' => array($this->lang->gitlab->tokenError))));
if(!isset($user->id)) return $this->send(array('result' => 'fail', 'message' => array('token' => array($this->lang->gitlab->tokenError))));
/* Verify version compatibility. */
$result = $this->gitlab->getVersion($gitlab->url, $gitlab->token);