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

* [misc] adjust repo data.

Browse Source
This commit is contained in:
caoyanyi
2024-10-23 14:21:57 +08:00
committed by 田淑杰
parent 69cbe34c73
commit 1a70951891
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/control.php
+5 -5
View File
@@ -1124,23 +1124,23 @@ class gitlab extends control
}
}
$gitlabCurrentMembers = $this->gitlab->apiGetProjectMembers($repo->gitService, $repo->project);
$gitlabCurrentMembers = $this->gitlab->apiGetProjectMembers($repo->gitService, (int)$repo->serviceProject);
list($addedMembers, $deletedMembers, $updatedMembers) = $this->gitlabZen->getProjectMemberData($gitlabCurrentMembers, $newGitlabMembers, $bindedUsers, $accounts, !empty($repo->acl->users) ? $repo->acl->users : array());
foreach($addedMembers as $addedMember)
{
$this->gitlab->apiCreateProjectMember($repo->gitService, $repo->project, $addedMember);
$this->gitlab->apiCreateProjectMember($repo->gitService, (int)$repo->serviceProject, $addedMember);
}
foreach($updatedMembers as $updatedMember)
{
$this->gitlab->apiUpdateProjectMember($repo->gitService, $repo->project, $updatedMember);
$this->gitlab->apiUpdateProjectMember($repo->gitService, (int)$repo->serviceProject, $updatedMember);
}
foreach($deletedMembers as $deletedMemberID)
{
$this->gitlab->apiDeleteProjectMember($repo->gitService, $repo->project, (int)$deletedMemberID);
$this->gitlab->apiDeleteProjectMember($repo->gitService, (int)$repo->serviceProject, (int)$deletedMemberID);
}
$repo->acl->users = array_values($accounts);
@@ -1150,7 +1150,7 @@ class gitlab extends control
$repo = $this->loadModel('repo')->getByID($repoID);
$users = $this->loadModel('user')->getPairs('noletter|noempty|nodeleted|noclosed');
$projectMembers = $this->gitlab->apiGetProjectMembers($repo->gitService, $repo->project);
$projectMembers = $this->gitlab->apiGetProjectMembers($repo->gitService, (int)$repo->serviceProject);
if(!is_array($projectMembers)) $projectMembers = array();
/* Get users accesslevel. */