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

Merge branch 'devops20' into 'devops_caoyanyi'

Browse Source 
# Conflicts:
#   module/gitlab/model.php
This commit is contained in:
李玉春
2022-01-20 06:10:57 +00:00
parent f87294adf7 03cc2f1346
commit 7942d9a886
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+5 -5
View File
@@ -478,8 +478,8 @@ class gitlabModel extends model
while(true)
{
/* Also use `per_page=20` to fetch users in API. Fetch active users only. */
$url = sprintf($apiRoot, "/users") . "&order_by={$order}&sort={$sort}&page={$page}&per_page=20&active=true";
$result = json_decode(commonModel::http($url));
$url = sprintf($apiRoot, "/users") . "&order_by={$order}&sort={$sort}&page={$page}&per_page=20&active=true";
$result = json_decode(commonModel::http($url));
if(!empty($result))
{
$response = array_merge($response, $result);
@@ -506,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;
}