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

* Fix error.

Browse Source
This commit is contained in:
liyuchun
2022-01-26 09:01:40 +08:00
parent e0ad5fe9af
commit d95187f42b
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+13 -5
View File
@@ -61,15 +61,23 @@ class gitlabModel extends model
/**
* Get gitlab api base url by gitlab id.
*
* @param int $id
* @param int $gitlabID
* @access public
* @return string
*/
public function getApiRoot($id)
public function getApiRoot($gitlabID)
{
$gitlab = $this->getByID($id);
$gitlab = $this->getByID($gitlabID);
if(!$gitlab) return '';
return rtrim($gitlab->url, '/') . '/api/v4%s' . "?private_token={$gitlab->token}";
$sudoParam = '';
if(!$this->app->user->admin)
{
$openID = $this->getUserIDByZentaoAccount($gitlabID, $this->app->user->account);
if($openID) $sudoParam = "&sudo={$openID}";
}
return rtrim($gitlab->url, '/') . '/api/v4%s' . "?private_token={$gitlab->token}" . $sudoParam;
}
/**
@@ -596,7 +604,7 @@ class gitlabModel extends model
{
$apiRoot = $this->getApiRoot($gitlabID);
$url = sprintf($apiRoot, "/groups");
if($minRole == 'owner')
if($minRole == 'owner')
{
$url .= '&owned=true';
}