Merge branch ztflow-liyang-dev/story-74954#liyang of zentao/zentaopms (#8907)

This commit is contained in:
刘刚
2025-05-27 11:23:54 +08:00
committed by Gitfox
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -690,7 +690,7 @@ class gitlab extends control
$groups = $this->gitlab->apiGetGroups($gitlabID, 'name_asc', 'maintainer');
foreach($groups as $group) $groupIDList[] = $group->id;
foreach($result['projects'] as $key => $project)
foreach($result['projects'] as $project)
{
$project->adminer = (bool)$this->app->user->admin;
if(!$project->adminer and isset($project->owner) and $project->owner->id == $openID) $project->adminer = true;
+1
View File
@@ -639,6 +639,7 @@ class gitlabModel extends model
$this->app->loadClass('pager', true);
$pager = pager::init($recTotal, $recPerPage, $pager->pageID);
if(empty($recTotal)) return array('pager' => $pager, 'projects' => array());
return array('pager' => $pager, 'projects' => json_decode($result['body']));
}