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

* Unit test and adjust code

Browse Source
This commit is contained in:
zenggang
2022-01-25 08:33:21 +00:00
parent 6766cbe5f0
commit 5f83afb622
8 changed files with 80 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/model.php
+8 -3
View File
@@ -52,7 +52,7 @@ class mrModel extends model
if($filterProjects === false) return array();
$filterProjectSql = '';
if(!empty($filterProjects))
if(!$this->app->user->admin and !empty($filterProjects))
{
foreach($filterProjects as $gitlabID => $projects)
{
@@ -113,9 +113,14 @@ class mrModel extends model
if(!$this->app->user->admin and !isset($gitlabUsers[$gitlabID])) continue;
$allProjects[$gitlabID] = $this->gitlab->apiGetProjects($gitlabID, 'false');
/* If not an administrator, need to obtain group member information. */
$groupIDList = array(0 => 0);
$groups = $this->gitlab->apiGetGroups($gitlabID, 'name_asc', $this->config->gitlab->accessLevel['reporter']);
foreach($groups as $group) $groupIDList[] = $group->id;
if(!$this->app->user->admin)
{
$groups = $this->gitlab->apiGetGroups($gitlabID, 'name_asc', $this->config->gitlab->accessLevel['reporter']);
foreach($groups as $group) $groupIDList[] = $group->id;
}
$allGroups[$gitlabID] = $groupIDList;
}