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

* Fix bug#18978

Browse Source
This commit is contained in:
zenggang
2022-01-26 01:58:00 +00:00
parent 42238429ce
commit ce37bf9985
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+5 -4
View File
@@ -62,16 +62,17 @@ class gitlabModel extends model
* Get gitlab api base url by gitlab id.
*
* @param int $gitlabID
* @param bool $sudo
* @access public
* @return string
*/
public function getApiRoot($gitlabID)
public function getApiRoot($gitlabID, $sudo = true)
{
$gitlab = $this->getByID($gitlabID);
if(!$gitlab) return '';
$sudoParam = '';
if(!$this->app->user->admin)
if($sudo == true and !$this->app->user->admin)
{
$openID = $this->getUserIDByZentaoAccount($gitlabID, $this->app->user->account);
if($openID) $sudoParam = "&sudo={$openID}";
@@ -1103,7 +1104,7 @@ class gitlabModel extends model
*/
public function apiGetHooks($gitlabID, $projectID)
{
$apiRoot = $this->getApiRoot($gitlabID);
$apiRoot = $this->getApiRoot($gitlabID, false);
$apiPath = "/projects/{$projectID}/hooks";
$url = sprintf($apiRoot, $apiPath);
@@ -1148,7 +1149,7 @@ class gitlabModel extends model
foreach($hook as $index => $item) $newHook->$index= $item;
$apiRoot = $this->getApiRoot($gitlabID);
$apiRoot = $this->getApiRoot($gitlabID, false);
$url = sprintf($apiRoot, "/projects/{$projectID}/hooks");
return json_decode(commonModel::http($url, $newHook));