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

* Add sudo in gitlab api url.

Browse Source
This commit is contained in:
liyuchun
2022-01-20 13:11:40 +08:00
parent 7e96eb9f68
commit c561a9b666
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+12 -4
View File
@@ -64,7 +64,15 @@ class gitlabModel extends model
{
$gitlab = $this->getByID($id);
if(!$gitlab) return '';
return rtrim($gitlab->url, '/') . '/api/v4%s' . "?private_token={$gitlab->token}";
$sudoParam = '';
if(!$this->app->user->admin)
{
$openID = $this->getUserIDByZentaoAccount($id, $this->app->user->account);
if($openID) $sudoParam = "&sudo={$openID}";
}
return rtrim($gitlab->url, '/') . '/api/v4%s' . "?private_token={$gitlab->token}" . $sudoParam;
}
/**
@@ -498,10 +506,10 @@ class gitlabModel extends model
$user->id = $gitlabUser->id;
$user->realname = $gitlabUser->name;
$user->account = $gitlabUser->username;
$user->email = $gitlabUser->email;
$user->email = zget($gitlabUser, 'email', '');
$user->avatar = $gitlabUser->avatar_url;
$user->createdAt = $gitlabUser->created_at;
$user->lastActivityOn = $gitlabUser->last_activity_on;
$user->createdAt = zget($gitlabUser, 'created_at', '');
$user->lastActivityOn = zget($gitlabUser, 'last_activity_on', '');
$users[] = $user;
}
module/gitlab/view/binduser.html.php
+2 -2
View File
@@ -33,7 +33,7 @@
<td class='text-left'>
<strong><?php echo $gitlabUser->realname;?></strong>
<br>
<?php echo $gitlabUser->account . " &lt;" . $gitlabUser->email . "&gt;";?>
<?php if($gitlabUser->email) echo $gitlabUser->account . " &lt;" . $gitlabUser->email . "&gt;";?>
</td>
<td><?php echo html::select("zentaoUsers[$gitlabUser->id]", $userPairs, '', "class='form-control select chosen'" );?></td>
<td></td>
@@ -46,7 +46,7 @@
<td>
<strong><?php echo $gitlabUser->realname;?></strong>
<br>
<?php echo $gitlabUser->account . " &lt;" . $gitlabUser->email . "&gt;";?>
<?php if($gitlabUser->email) echo $gitlabUser->account . " &lt;" . $gitlabUser->email . "&gt;";?>
</td>
<td><?php echo html::select("zentaoUsers[$gitlabUser->id]", $userPairs, $gitlabUser->zentaoAccount, "class='form-control select chosen'" );?></td>
<td>